diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn
index ad42a59..55d302e 100644
--- a/s1gw/S1GW_Tests.ttcn
+++ b/s1gw/S1GW_Tests.ttcn
@@ -43,9 +43,16 @@
 };
 
 type component test_CT {
+	timer g_Tguard;
 	var S1AP_Server_CT vc_S1APSRV;
 };
 
+private altstep as_Tguard() runs on test_CT {
+	[] g_Tguard.timeout {
+		Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Tguard timeout");
+	}
+}
+
 template Global_ENB_ID
 ts_Global_ENB_ID(integer enb_id := 0,
 		 OCT3 plmn_id := '00f110'O) := {
@@ -56,6 +63,11 @@
 	iE_Extensions := omit
 }
 
+function f_init(float Tval := 20.0) runs on test_CT {
+	g_Tguard.start(Tval);
+	activate(as_Tguard());
+}
+
 function f_init_s1ap_srv() runs on test_CT {
 	var S1APSRV_ConnParams cpars := {
 		local_ip := mp_mme_bind_ip,
@@ -164,6 +176,7 @@
 	var ConnHdlrPars pars := { seed := 0 };
 	var ConnHdlr vc_conn;
 
+	f_init();
 	f_init_s1ap_srv();
 
 	vc_conn := f_ConnHdlr_spawn(refers(f_TC_setup), pars);
@@ -172,6 +185,7 @@
 testcase TC_setup_multi() runs on test_CT {
 	var ConnHdlrList vc_conns := { };
 
+	f_init();
 	f_init_s1ap_srv();
 
 	for (var integer i := 0; i < 42; i := i + 1) {