diff --git a/Makefile b/Makefile
index 074e15160..b8778af4a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-SUBDIRS=bsc bsc-nat bts ggsn_tests hlr lapdm mgw msc pcu sccp selftest sgsn sip sysinfo
+SUBDIRS=bsc bsc-nat bts ggsn_tests hlr mgw msc pcu sccp selftest sgsn sip sysinfo
 
 NPROC=$(shell nproc 2>/dev/null)
 ifeq ($(NPROC),)
diff --git a/lapdm/L1CTL_Test.ttcn b/bts/BTS_Tests_LAPDm.ttcn
similarity index 99%
rename from lapdm/L1CTL_Test.ttcn
rename to bts/BTS_Tests_LAPDm.ttcn
index 1922f7035..d6c605d5d 100644
--- a/lapdm/L1CTL_Test.ttcn
+++ b/bts/BTS_Tests_LAPDm.ttcn
@@ -1,4 +1,4 @@
-module L1CTL_Test {
+module BTS_Tests_LAPDm {
 	import from GSM_Types all;
 	import from Osmocom_Types all;
 	import from LAPDm_RAW_PT all;