diff --git a/bsc-nat/BSCNAT_Tests.cfg b/bsc-nat/BSCNAT_Tests.cfg
new file mode 100644
index 000000000..c40957ade
--- /dev/null
+++ b/bsc-nat/BSCNAT_Tests.cfg
@@ -0,0 +1,27 @@
+[ORDERED_INCLUDE]
+# Common configuration, shared between test suites
+"../Common.cfg"
+# testsuite specific configuration, not expected to change
+"./BSCNAT_Tests.default"
+
+# Local configuration below
+
+[LOGGING]
+
+[TESTPORT_PARAMETERS]
+
+[MODULE_PARAMETERS]
+
+[MAIN_CONTROLLER]
+
+[LOGGING]
+
+[TESTPORT_PARAMETERS]
+
+[MODULE_PARAMETERS]
+
+[MAIN_CONTROLLER]
+
+[EXECUTE]
+BSCNAT_Tests.control
+#BSCNAT_Tests.TC_recv_dump
diff --git a/bsc-nat/IPA_Test.cfg b/bsc-nat/BSCNAT_Tests.default
similarity index 67%
rename from bsc-nat/IPA_Test.cfg
rename to bsc-nat/BSCNAT_Tests.default
index 617e349ab..bb279bd2f 100644
--- a/bsc-nat/IPA_Test.cfg
+++ b/bsc-nat/BSCNAT_Tests.default
@@ -1,8 +1,6 @@
 [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;
+mtc.FileMask := ERROR | WARNING | PARALLEL | VERDICTOP;
 
 [TESTPORT_PARAMETERS]
 #*.*.udpReuseAddress := "yes";
@@ -23,8 +21,5 @@ FileMask := LOG_ALL | TTCN_MATCHING;
 #mp_mgw_ip := "127.0.0.1";
 #mp_mgw_udp_port := 2427;
 
-[MAIN_CONTROLLER]
-
 [EXECUTE]
-#MGCP_Test.TC_selftest
-IPA_Test.TC_recv_dump
+
diff --git a/bsc-nat/IPA_Test.ttcn b/bsc-nat/BSCNAT_Tests.ttcn
similarity index 99%
rename from bsc-nat/IPA_Test.ttcn
rename to bsc-nat/BSCNAT_Tests.ttcn
index fbff84abd..b6dca281c 100644
--- a/bsc-nat/IPA_Test.ttcn
+++ b/bsc-nat/BSCNAT_Tests.ttcn
@@ -1,4 +1,4 @@
-module IPA_Test {
+module BSCNAT_Tests {
 
 import from Osmocom_Types all;
 
diff --git a/bsc-nat/regen_makefile.sh b/bsc-nat/regen_makefile.sh
index 5c2536619..c5fe64c41 100755
--- a/bsc-nat/regen_makefile.sh
+++ b/bsc-nat/regen_makefile.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-MAIN=IPA_Test.ttcn
+MAIN=BSCNAT_Tests.ttcn
 
 FILES="*.ttcn *.ttcnpp SCCP_EncDec.cc IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc RTP_EncDec.cc SDP_EncDec.cc *.c MGCP_CodecPort_CtrlFunctDef.cc"