diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index c57328f..b66323b 100644
--- a/msc/MSC_Tests.ttcn
+++ b/msc/MSC_Tests.ttcn
@@ -2820,13 +2820,18 @@
 private function f_expect_gsup_msg(template GSUP_PDU msg)
 runs on BSC_ConnHdlr return GSUP_PDU {
 	var GSUP_PDU gsup_msg_complete;
+	timer T := 2.0;
 
+	T.start;
 	alt {
 	[] GSUP.receive(msg) -> value gsup_msg_complete {
 		setverdict(pass);
 		}
 	/* We don't expect anything else */
 	[] as_unexp_gsup_or_bssap_msg();
+	[] T.timeout {
+		setverdict(fail, "Timeout waiting for GSUP message: ", msg);
+		}
 	}
 
 	return gsup_msg_complete;
@@ -2835,13 +2840,18 @@
 private function f_expect_mt_dtap_msg(template PDU_ML3_NW_MS msg)
 runs on BSC_ConnHdlr return PDU_ML3_NW_MS {
 	var PDU_DTAP_MT bssap_msg_complete;
+	timer T := 2.0;
 
+	T.start;
 	alt {
 	[] BSSAP.receive(tr_PDU_DTAP_MT(msg)) -> value bssap_msg_complete {
 		setverdict(pass);
 		}
 	/* We don't expect anything else */
 	[] as_unexp_gsup_or_bssap_msg();
+	[] T.timeout {
+		setverdict(fail, "Timeout waiting for BSSAP message: ", msg);
+		}
 	}
 
 	return bssap_msg_complete.dtap;
@@ -2928,6 +2938,8 @@
 /* LU followed by MT USSD notification */
 friend function f_tc_lu_and_mt_ussd_notification(charstring id, BSC_ConnHdlrPars pars)
 runs on BSC_ConnHdlr {
+	timer T := 5.0;
+
 	f_init_handler(pars);
 
 	/* Perform location update */
@@ -2967,6 +2979,7 @@
 
 	/* Send it to MSC and expect Paging Request */
 	GSUP.send(gsup_req);
+	T.start;
 	alt {
 	[pars.ran_is_geran] BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi)) {
 		setverdict(pass);
@@ -2976,6 +2989,9 @@
 		}
 	/* We don't expect anything else */
 	[] as_unexp_gsup_or_bssap_msg();
+	[] T.timeout {
+		setverdict(fail, "Timeout waiting for Paging Request");
+		}
 	}
 
 	/* Send Paging Response and expect USSD notification */