diff --git a/remsim/RemsimClient_Tests.ttcn b/remsim/RemsimClient_Tests.ttcn
index 499fd3e..d7d6bc7 100644
--- a/remsim/RemsimClient_Tests.ttcn
+++ b/remsim/RemsimClient_Tests.ttcn
@@ -15,6 +15,7 @@
 import from Native_Functions all;
 import from Osmocom_Types all;
 import from IPA_Emulation all;
+import from Misc_Helpers all;
 
 /* the PIPEasp port allows us to interact with osmo-remsim-client-shell via stdin/stdout */
 import from PIPEasp_PortType all;
@@ -33,12 +34,24 @@
 type component client_test_CT extends rspro_server_CT {
 	port PIPEasp_PT PIPE;
 	var ComponentIdentity g_srv_comp_id, g_bankd_comp_id;
+	timer g_T_guard := 60.0;
 };
 
+private altstep as_Tguard() runs on client_test_CT {
+	[] g_T_guard.timeout {
+		setverdict(fail, "Timeout of T_guard");
+		Misc_Helpers.f_shutdown(__BFILE__, __LINE__);
+		}
+}
+
 private function f_init() runs on client_test_CT {
 	g_srv_comp_id := valueof(ts_CompId(remsimServer, "ttcn-server"));
 	g_bankd_comp_id := valueof(ts_CompId(remsimBankd, "ttcn-bankd"));
 
+	/* Start the guard timer */
+	g_T_guard.start;
+	activate(as_Tguard());
+
 	f_rspro_srv_init(0, mp_server_ip, mp_server_port, g_srv_comp_id);
 	f_rspro_srv_init(1, mp_bankd_ip, mp_bankd_port, g_bankd_comp_id, exp_connect := false);
 }