diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn
index 4afb8dd..505beab 100644
--- a/hnbgw/HNBGW_Tests.ttcn
+++ b/hnbgw/HNBGW_Tests.ttcn
@@ -194,6 +194,10 @@
 	charstring mp_pfcp_ip_remote := "127.0.0.2";
 
 	boolean mp_validate_talloc_asn1 := true;
+
+	/* The X31 timer configured at osmo-hnbgw (seconds). This provided an idea on
+	 * minimum time the test must wait to consider this timer triggered */
+	integer mp_hnbgw_timer_x31 := 5;
 }
 
 function MSC_UnitdataCallback(RANAP_PDU ranap) runs on RAN_Emulation_CT return template RANAP_PDU {
@@ -763,7 +767,7 @@
 			     template RANAP_PDU exp_rx := omit)
 runs on ConnHdlr return RANAP_PDU {
 	var RANAP_PDU rx
-	timer T := 10.0;
+	timer T := int2float(mp_hnbgw_timer_x31) + 1.0;
 
 	if (istemplatekind(exp_rx, "omit")) {
 		exp_rx := tx;