diff --git a/bsc/BSC_Tests.cfg b/bsc/BSC_Tests.cfg
index 217c367..ef6823c 100644
--- a/bsc/BSC_Tests.cfg
+++ b/bsc/BSC_Tests.cfg
@@ -15,7 +15,7 @@
 [MAIN_CONTROLLER]
 
 [EXECUTE]
-#BSC_Tests.control
+BSC_Tests.control
 #BSC_Tests.TC_chan_act_noreply
 #BSC_Tests.TC_chan_act_ack_noest
 #BSC_Tests.TC_chan_act_ack_est_ind_noreply
diff --git a/bsc/BSC_Tests.default b/bsc/BSC_Tests.default
index baa3b54..19c0c8c 100644
--- a/bsc/BSC_Tests.default
+++ b/bsc/BSC_Tests.default
@@ -20,4 +20,3 @@
 Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoBSC";
 
 [EXECUTE]
-BSC_Tests.control
diff --git a/bts/BTS_Tests.default b/bts/BTS_Tests.default
index fa8d0b0..196d088 100644
--- a/bts/BTS_Tests.default
+++ b/bts/BTS_Tests.default
@@ -19,4 +19,3 @@
 Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoBTS";
 
 [EXECUTE]
-BTS_Tests.control
diff --git a/ggsn_tests/GGSN_Tests.cfg b/ggsn_tests/GGSN_Tests.cfg
index b7c0988..e849ed4 100644
--- a/ggsn_tests/GGSN_Tests.cfg
+++ b/ggsn_tests/GGSN_Tests.cfg
@@ -15,3 +15,4 @@
 [MODULE_PARAMETERS]
 
 [EXECUTE]
+GGSN_Tests.control
diff --git a/ggsn_tests/GGSN_Tests.default b/ggsn_tests/GGSN_Tests.default
index 7b9fe69..2d57f89 100644
--- a/ggsn_tests/GGSN_Tests.default
+++ b/ggsn_tests/GGSN_Tests.default
@@ -13,4 +13,3 @@
 GGSN_Tests.m_ggsn_ip6_dns2 := "2001:4860:4860::8844"
 
 [EXECUTE]
-GGSN_Tests.control
diff --git a/hlr/HLR_Tests.cfg b/hlr/HLR_Tests.cfg
index 98b9e27..7416362 100644
--- a/hlr/HLR_Tests.cfg
+++ b/hlr/HLR_Tests.cfg
@@ -16,3 +16,4 @@
 [MAIN_CONTROLLER]
 
 [EXECUTE]
+HLR_Tests.control
diff --git a/hlr/HLR_Tests.default b/hlr/HLR_Tests.default
index 91d5454..f458479 100644
--- a/hlr/HLR_Tests.default
+++ b/hlr/HLR_Tests.default
@@ -15,4 +15,3 @@
 Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoHLR";
 
 [EXECUTE]
-HLR_Tests.control
diff --git a/mgw/MGCP_Test.cfg b/mgw/MGCP_Test.cfg
index b936fe1..0cca79e 100644
--- a/mgw/MGCP_Test.cfg
+++ b/mgw/MGCP_Test.cfg
@@ -15,6 +15,7 @@
 [MAIN_CONTROLLER]
 
 [EXECUTE]
+MGCP_Test.control
 #MGCP_Test.TC_selftest
 ##MGCP_Test.TC_crcx
 #MGCP_Test.TC_crcx_noprefix
diff --git a/mgw/MGCP_Test.default b/mgw/MGCP_Test.default
index c9d6129..16027cc 100644
--- a/mgw/MGCP_Test.default
+++ b/mgw/MGCP_Test.default
@@ -12,4 +12,3 @@
 [MAIN_CONTROLLER]
 
 [EXECUTE]
-MGCP_Test.control
diff --git a/msc/MSC_Tests.cfg b/msc/MSC_Tests.cfg
index 6fb3523..a1f1332 100644
--- a/msc/MSC_Tests.cfg
+++ b/msc/MSC_Tests.cfg
@@ -15,6 +15,7 @@
 [MAIN_CONTROLLER]
 
 [EXECUTE]
+MSC_Tests.control
 #MSC_Tests.TC_reset
 #MSC_Tests.TC_cmserv_imsi_unknown
 #MSC_Tests.TC_lu_imsi_noauth_tmsi
diff --git a/msc/MSC_Tests.default b/msc/MSC_Tests.default
index 6c3e29c..eff5d96 100644
--- a/msc/MSC_Tests.default
+++ b/msc/MSC_Tests.default
@@ -37,4 +37,3 @@
 [MAIN_CONTROLLER]
 
 [EXECUTE]
-MSC_Tests.control
diff --git a/sgsn/SGSN_Tests.default b/sgsn/SGSN_Tests.default
index 6d120fb..67a8032 100644
--- a/sgsn/SGSN_Tests.default
+++ b/sgsn/SGSN_Tests.default
@@ -30,4 +30,3 @@
 [MAIN_CONTROLLER]
 
 [EXECUTE]
-SGSN_Tests.control