diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index 63e90f4..bdd9f62 100644
--- a/msc/MSC_Tests.ttcn
+++ b/msc/MSC_Tests.ttcn
@@ -702,12 +702,15 @@
 				T_wait_iar.stop
 				setverdict(pass);
 		}
-	[] MGCP.receive(tr_DLCX(?)) { repeat; }
 	[] T_wait_iar.timeout {
 		setverdict(fail, "Timeout waiting for T(iar) triggered SCCP RSLD");
 		mtc.stop;
 		}
 	}
+	/* DLCX for both directions; if we don't do this, we might receive either of the two during
+	 * shutdown causing race conditions */
+	MGCP.receive(tr_DLCX(?));
+	MGCP.receive(tr_DLCX(?));
 
 	setverdict(pass);
 }