diff --git a/Makefile b/Makefile
index 80211defd..f009560fe 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-SUBDIRS=bsc bsc-nat ggsn_tests gprs_gb lapdm mgw msc_tests selftest sysinfo
+SUBDIRS=bsc bsc-nat ggsn_tests gprs_gb lapdm mgw msc selftest sysinfo
 
 PARALLEL_MAKE:=-j4
 
diff --git a/msc_tests/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn
similarity index 100%
rename from msc_tests/BSC_ConnectionHandler.ttcn
rename to msc/BSC_ConnectionHandler.ttcn
diff --git a/msc_tests/MSC_Tests.cfg b/msc/MSC_Tests.cfg
similarity index 100%
rename from msc_tests/MSC_Tests.cfg
rename to msc/MSC_Tests.cfg
diff --git a/msc_tests/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
similarity index 100%
rename from msc_tests/MSC_Tests.ttcn
rename to msc/MSC_Tests.ttcn
diff --git a/msc_tests/gen_links.sh b/msc/gen_links.sh
similarity index 100%
rename from msc_tests/gen_links.sh
rename to msc/gen_links.sh
diff --git a/msc_tests/regen_makefile.sh b/msc/regen_makefile.sh
similarity index 100%
rename from msc_tests/regen_makefile.sh
rename to msc/regen_makefile.sh