diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn
index 3996a8772..30adb03f0 100644
--- a/msc/BSC_ConnectionHandler.ttcn
+++ b/msc/BSC_ConnectionHandler.ttcn
@@ -62,10 +62,6 @@ import from SGsAP_Emulation all;
 
 import from TCCConversion_Functions { function f_strstr };
 
-modulepar {
-	boolean mp_expect_common_id := true;
-}
-
 /* this component represents a single subscriber connection */
 type component BSC_ConnHdlr extends RAN_ConnHdlr, MNCC_ConnHdlr, GSUP_ConnHdlr, MGCP_ConnHdlr, SMPP_ConnHdlr, CTRL_Adapter_CT, SGsAP_ConnHdlr {
 	var BSC_ConnHdlrPars g_pars;
@@ -528,9 +524,7 @@ function f_mm_imei_early() runs on BSC_ConnHdlr
 function f_expect_common_id() runs on BSC_ConnHdlr
 {
 	if (g_pars.ran_is_geran) {
-		if (mp_expect_common_id) {
-			BSSAP.receive(tr_BSSMAP_CommonId(g_pars.imsi));
-		}
+		BSSAP.receive(tr_BSSMAP_CommonId(g_pars.imsi));
 	} else {
 		BSSAP.receive(tr_RANAP_CommonId(imsi_hex2oct(g_pars.imsi)));
 	}
diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index 6bad9c353..7a54e1742 100644
--- a/msc/MSC_Tests.ttcn
+++ b/msc/MSC_Tests.ttcn
@@ -162,10 +162,6 @@ modulepar {
 			rctx := 1
 		}
 	};
-
-	boolean mp_enable_cell_id_test := true;
-
-	boolean mp_enable_crashing_tests := true;
 }
 
 /* altstep for the global guard timer (only used when BSSAP_DIRECT
@@ -404,7 +400,7 @@ runs on MTC_CT return BSC_ConnHdlrPars {
 		ran_is_geran := ran_is_geran,
 		use_osmux := use_osmux,
 		use_ipv6 := false,
-		verify_cell_id := mp_enable_cell_id_test and verify_cell_id
+		verify_cell_id := verify_cell_id
 	};
 	if (not ran_is_geran) {
 		pars.use_umts_aka := true;
@@ -6534,10 +6530,8 @@ control {
 	execute( TC_invalid_mgcp_crash() );
 	execute( TC_mm_id_resp_no_identity() );
 	execute( TC_lu_and_expire_while_paging() );
-	if (mp_enable_crashing_tests) {
-		execute( TC_paging_response_imsi_unknown() );
-		execute( TC_paging_response_tmsi_unknown() );
-	}
+	execute( TC_paging_response_imsi_unknown() );
+	execute( TC_paging_response_tmsi_unknown() );
 }