diff --git a/msc/MSC_Tests.cfg b/msc/MSC_Tests.cfg
index a7605ab..6fb3523 100644
--- a/msc/MSC_Tests.cfg
+++ b/msc/MSC_Tests.cfg
@@ -1,42 +1,16 @@
-[LOGGING]
-SourceInfoFormat := Single;
-#FileMask := LOG_ALL | TTCN_DEBUG | TTCN_MATCHING | DEBUG_ENCDEC;
-#ConsoleMask := ERROR | WARNING | TESTCASE | TTCN_MATCHING | DEBUG_ENCDEC
-FileMask := LOG_ALL | TTCN_MATCHING;
+[ORDERED_INCLUDE]
+# Common configuration, shared between test suites
+"../Common.cfg"
+# testsuite specific configuration, not expected to change
+"./MSC_Tests.default"
 
-#BSSAP.FileMask := LOG_NOTHING;
-"MSC_Test-M3UA".FileMask := ERROR | WARNING;
-"MSC_Test-SCCP".FileMask := ERROR | WARNING;
-"MSC_Test-GSUP-IPA".FileMask := ERROR | WARNING;
-"MSC_Test-GSUP".FileMask := ERROR | WARNING;
-"IPA-CTRL-IPA".FileMask := ERROR | WARNING;
-mtc.FileMask := ERROR | WARNING;
+# Local configuration below
+
+[LOGGING]
 
 [TESTPORT_PARAMETERS]
-#*.*.udpReuseAddress := "yes";
-"MSC_Test-MNCC".MNCC.socket_type := "SEQPACKET";
-*.MSCVTY.CTRL_MODE := "client"
-*.MSCVTY.CTRL_HOSTNAME := "127.0.0.1"
-*.MSCVTY.CTRL_PORTNUM := "4254"
-*.MSCVTY.CTRL_LOGIN_SKIPPED := "yes"
-*.MSCVTY.CTRL_DETECT_SERVER_DISCONNECTED := "yes"
-*.MSCVTY.CTRL_READMODE := "buffered"
-*.MSCVTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes"
-*.MSCVTY.PROMPT1 := "OsmoMSC> "
-
 
 [MODULE_PARAMETERS]
-M3UA_Emulation.tsp_logVerbose := true;
-MSC_Tests.mp_bssap_cfg := {
-	sccp_service_type := "mtp3_itu",
-	sctp_addr := { 23906, "127.0.0.1", 2905, "127.0.0.1" },
-	own_pc := 193,
-	own_ssn := 254,
-	peer_pc := 185,
-	peer_ssn := 254,
-	sio := '83'O
-};
-Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoMSC";
 
 [MAIN_CONTROLLER]
 
@@ -45,4 +19,4 @@
 #MSC_Tests.TC_cmserv_imsi_unknown
 #MSC_Tests.TC_lu_imsi_noauth_tmsi
 #MSC_Tests.TC_lu_imsi_noauth_notmsi
-MSC_Tests.TC_lu_imsi_reject
+#MSC_Tests.TC_lu_imsi_reject
diff --git a/msc/MSC_Tests.default b/msc/MSC_Tests.default
new file mode 100644
index 0000000..6c3e29c
--- /dev/null
+++ b/msc/MSC_Tests.default
@@ -0,0 +1,40 @@
+[LOGGING]
+FileMask := LOG_ALL | TTCN_MATCHING;
+
+BSSAP.FileMask := LOG_NOTHING;
+"MSC_Test-M3UA".FileMask := ERROR | WARNING;
+"MSC_Test-SCCP".FileMask := ERROR | WARNING;
+"MSC_Test-GSUP-IPA".FileMask := ERROR | WARNING;
+"MSC_Test-GSUP".FileMask := ERROR | WARNING;
+"IPA-CTRL-IPA".FileMask := ERROR | WARNING;
+mtc.FileMask := ERROR | WARNING;
+
+[TESTPORT_PARAMETERS]
+"MSC_Test-MNCC".MNCC.socket_type := "SEQPACKET";
+*.MSCVTY.CTRL_MODE := "client"
+*.MSCVTY.CTRL_HOSTNAME := "127.0.0.1"
+*.MSCVTY.CTRL_PORTNUM := "4254"
+*.MSCVTY.CTRL_LOGIN_SKIPPED := "yes"
+*.MSCVTY.CTRL_DETECT_SERVER_DISCONNECTED := "yes"
+*.MSCVTY.CTRL_READMODE := "buffered"
+*.MSCVTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes"
+*.MSCVTY.PROMPT1 := "OsmoMSC> "
+
+
+[MODULE_PARAMETERS]
+M3UA_Emulation.tsp_logVerbose := true;
+MSC_Tests.mp_bssap_cfg := {
+	sccp_service_type := "mtp3_itu",
+	sctp_addr := { 23906, "127.0.0.1", 2905, "127.0.0.1" },
+	own_pc := 193,
+	own_ssn := 254,
+	peer_pc := 185,
+	peer_ssn := 254,
+	sio := '83'O
+};
+Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoMSC";
+
+[MAIN_CONTROLLER]
+
+[EXECUTE]
+MSC_Tests.control