diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index ebcd576..98f60ef 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -6374,11 +6374,16 @@
 
 		/* When we let MGCP MDCX run into a timeout, it's still in the
 		 * queue and additionally after BSSAP HandoverFailure, two DLCX
-		 * get sent. */
+		 * get sent (for AoIP, for SCCPlite one DLCX). */
 		if (g_pars.ignore_mgw_mdcx) {
-			MGCP.receive(tr_MDCX);
-			MGCP.receive(tr_DLCX);
-			MGCP.receive(tr_DLCX);
+			if (g_pars.aoip) {
+				MGCP.receive(tr_MDCX);
+				MGCP.receive(tr_DLCX);
+				MGCP.receive(tr_DLCX);
+			} else {
+				MGCP_MULTI.receive(tr_MGCP_RecvFrom_any({command := tr_MDCX}));
+				MGCP_MULTI.receive(tr_MGCP_RecvFrom_any({command := tr_DLCX}));
+			}
 		}
 		return;
 	}