diff --git a/remsim/RemsimBankd_Tests.ttcn b/remsim/RemsimBankd_Tests.ttcn
index 47beedd..a2686d3 100644
--- a/remsim/RemsimBankd_Tests.ttcn
+++ b/remsim/RemsimBankd_Tests.ttcn
@@ -35,11 +35,23 @@
 /* We implement a RSPRO server to simulate the remsim-server and a
    RSPRO client to simulate a remsim-client connecting to bankd */
 type component bankd_test_CT extends rspro_server_CT, rspro_client_CT, VPCD_Adapter_CT {
+	timer g_T_guard := 60.0;
+}
+
+private altstep as_Tguard() runs on bankd_test_CT {
+	[] g_T_guard.timeout {
+		setverdict(fail, "Timeout of T_guard");
+		Misc_Helpers.f_shutdown(__BFILE__, __LINE__);
+		}
 }
 
 private function f_init(boolean start_client := false) runs on bankd_test_CT {
 	var ComponentIdentity srv_comp_id := valueof(ts_CompId(remsimServer, "ttcn-server"));
 
+	/* Start the guard timer */
+	g_T_guard.start;
+	activate(as_Tguard());
+
 	f_rspro_srv_init(0, mp_server_ip, mp_server_port, srv_comp_id);
 
 	if (start_client) {