diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index f6e8577..fb2a46e 100644
--- a/msc/MSC_Tests.ttcn
+++ b/msc/MSC_Tests.ttcn
@@ -164,6 +164,8 @@
 	};
 
 	boolean mp_enable_cell_id_test := true;
+
+	boolean mp_enable_crashing_tests := true;
 }
 
 /* altstep for the global guard timer (only used when BSSAP_DIRECT
@@ -6437,15 +6439,16 @@
 	execute( TC_lu_imsi_noauth_notmsi_check_imei_early() );
 	execute( TC_lu_imsi_auth_tmsi_check_imei_early_nack() );
 	execute( TC_lu_imsi_auth_tmsi_check_imei_early_err() );
-
-	/* Run this last: at the time of writing this test crashes the MSC */
 	execute( TC_lu_imsi_auth_tmsi_encr_3_1_log_msc_debug() );
+
 	execute( TC_mo_cc_bssmap_clear() );
 	execute( TC_invalid_mgcp_crash() );
 	execute( TC_mm_id_resp_no_identity() );
 	execute( TC_lu_and_expire_while_paging() );
-	execute( TC_paging_response_imsi_unknown() );
-	execute( TC_paging_response_tmsi_unknown() );
+	if (mp_enable_crashing_tests) {
+		execute( TC_paging_response_imsi_unknown() );
+		execute( TC_paging_response_tmsi_unknown() );
+	}
 }