diff --git a/ttcn3-bts-test/Dockerfile b/ttcn3-bts-test/Dockerfile
index d676bf03..b1150005 100644
--- a/ttcn3-bts-test/Dockerfile
+++ b/ttcn3-bts-test/Dockerfile
@@ -8,6 +8,6 @@ RUN	ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" bts
 
 VOLUME	/data
 
-COPY	BTS_Tests.cfg /data/BTS_Tests.cfg
+COPY	generic/BTS_Tests.cfg /data/BTS_Tests.cfg
 
 CMD	ttcn3-docker-run bts BTS_Tests
diff --git a/ttcn3-bts-test/BTS_Tests.cfg b/ttcn3-bts-test/generic/BTS_Tests.cfg
similarity index 100%
rename from ttcn3-bts-test/BTS_Tests.cfg
rename to ttcn3-bts-test/generic/BTS_Tests.cfg
diff --git a/ttcn3-bts-test/osmo-bsc.cfg b/ttcn3-bts-test/generic/osmo-bsc.cfg
similarity index 100%
rename from ttcn3-bts-test/osmo-bsc.cfg
rename to ttcn3-bts-test/generic/osmo-bsc.cfg
diff --git a/ttcn3-bts-test/osmo-bts.cfg b/ttcn3-bts-test/generic/osmo-bts.cfg
similarity index 100%
rename from ttcn3-bts-test/osmo-bts.cfg
rename to ttcn3-bts-test/generic/osmo-bts.cfg
diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh
index 395407b7..35ce0d52 100755
--- a/ttcn3-bts-test/jenkins.sh
+++ b/ttcn3-bts-test/jenkins.sh
@@ -120,7 +120,7 @@ SUBNET=9
 network_create $SUBNET
 
 mkdir $VOL_BASE_DIR/bts-tester-generic
-cp BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-generic/
+cp generic/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-generic/
 write_mp_osmo_repo "$VOL_BASE_DIR/bts-tester-generic/BTS_Tests.cfg"
 mkdir $VOL_BASE_DIR/bts-tester-virtphy
 cp virtphy/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-virtphy/
@@ -136,11 +136,11 @@ cp $VOL_BASE_DIR/bts-tester-generic/BTS_Tests.cfg \
    $VOL_BASE_DIR/bts-tester-hopping/BTS_Tests.cfg.inc
 
 mkdir $VOL_BASE_DIR/bsc
-cp osmo-bsc.cfg $VOL_BASE_DIR/bsc/
+cp generic/osmo-bsc.cfg $VOL_BASE_DIR/bsc/
 
 mkdir $VOL_BASE_DIR/bts
 mkdir $VOL_BASE_DIR/bts/unix
-cp osmo-bts.cfg $VOL_BASE_DIR/bts/
+cp generic/osmo-bts.cfg $VOL_BASE_DIR/bts/
 
 mkdir $VOL_BASE_DIR/unix
 
@@ -182,7 +182,7 @@ start_testsuite oml
 
 # 4) Frequency hopping tests require different configuration files
 cp fh/osmo-bsc.cfg $VOL_BASE_DIR/bsc/
-cp osmo-bts.cfg $VOL_BASE_DIR/bts/
+cp generic/osmo-bts.cfg $VOL_BASE_DIR/bts/
 # restart the BSC/BTS and run the testsuite again
 docker container kill ${BUILD_TAG}-bts
 start_bsc