diff --git a/msc/MSC_Tests.default b/msc/MSC_Tests.default
index cd984fd57..e8508c25b 100644
--- a/msc/MSC_Tests.default
+++ b/msc/MSC_Tests.default
@@ -27,6 +27,7 @@ mtc.FileMask := ERROR | WARNING;
 M3UA_Emulation.tsp_logVerbose := true;
 MSC_Tests.mp_bssap_cfg := {
 	{
+		transport := BSSAP_TRANSPORT_AoIP,
 		sccp_service_type := "mtp3_itu",
 		sctp_addr := { 23906, "127.0.0.1", 2905, "127.0.0.1" },
 		own_pc := 193,
@@ -37,6 +38,7 @@ MSC_Tests.mp_bssap_cfg := {
 		rctx := 0
 	},
 	{
+		transport := BSSAP_TRANSPORT_AoIP,
 		sccp_service_type := "mtp3_itu",
 		sctp_addr := { 23907, "127.0.0.1", 2905, "127.0.0.1" },
 		own_pc := 194,
@@ -48,6 +50,14 @@ MSC_Tests.mp_bssap_cfg := {
 	}
 };
 
+# remote (IUT) side
+MSC_Tests.mp_msc_mncc := "/tmp/mncc.sock";
+MSC_Tests.mp_msc_ip := "127.0.0.1"
+# local (emulation) side)
+MSC_Tests.mp_hlr_ip := "127.0.0.1"
+MSC_Tests.mp_mgw_ip := "127.0.0.1"
+
+
 Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoMSC";
 
 [MAIN_CONTROLLER]
diff --git a/msc/osmo-msc.cfg b/msc/osmo-msc.cfg
new file mode 100644
index 000000000..80f2fba67
--- /dev/null
+++ b/msc/osmo-msc.cfg
@@ -0,0 +1,87 @@
+!
+! OsmoMSC (1.1.2.66-629c4-dirty) configuration saved from vty
+!!
+!
+log stderr
+  logging filter all 1
+  logging color 0
+  logging print category 1
+  logging timestamp 1
+  logging level all everything
+  logging level rll notice
+  logging level cc debug
+  logging level mm debug
+  logging level rr notice
+  logging level mncc debug
+  logging level pag notice
+  logging level msc notice
+  logging level mgcp debug
+  logging level ho notice
+  logging level db notice
+  logging level ref notice
+  logging level ctrl notice
+  logging level smpp debug
+  logging level ranap debug
+  logging level vlr debug
+  logging level iucs debug
+  logging level lglobal notice
+  logging level llapd notice
+  logging level linp notice
+  logging level lmux notice
+  logging level lmi notice
+  logging level lmib notice
+  logging level lsms notice
+  logging level lctrl info
+  logging level lgtp notice
+  logging level lstats notice
+  logging level lgsup notice
+  logging level loap notice
+  logging level lss7 notice
+  logging level lsccp notice
+  logging level lsua notice
+  logging level lm3ua notice
+  logging level lmgcp debug
+!
+stats interval 5
+!
+line vty
+ no login
+ #bind 0.0.0.0
+ctrl
+ #bind 0.0.0.0
+!
+cs7 instance 0
+ point-code 0.23.1
+ asp asp-clnt-OsmoMSC-A 2905 0 m3ua
+  remote-ip 127.0.0.1
+ as as-clnt-OsmoMSC-A m3ua
+  asp asp-clnt-OsmoMSC-A
+  routing-key 2 0.23.1
+network
+ network country code 262
+ mobile network code 42
+ short name OsmoMSC
+ long name OsmoMSC
+ encryption a5 0
+ authentication optional
+ rrlp mode none
+ mm info 0
+ periodic location update 30
+msc
+ assign-tmsi
+ cs7-instance-a 0
+ cs7-instance-iu 0
+ mgw remote-ip 127.0.0.1
+ emergency-call route-to-msisdn 112
+mncc-int
+ default-codec tch-f fr
+ default-codec tch-h hr
+smpp
+ local-tcp-port 2775
+ policy closed
+ no smpp-first
+ esme msc_tester
+  password osmocom1
+hlr
+ remote-ip 127.0.0.1
+ #remote-port 4222
diff --git a/msc/osmo-stp.cfg b/msc/osmo-stp.cfg
new file mode 100644
index 000000000..aa0a326ca
--- /dev/null
+++ b/msc/osmo-stp.cfg
@@ -0,0 +1,52 @@
+!
+! OsmoSTP (0.8.1) configuration saved from vty
+!!
+!
+log stderr
+  logging filter all 1
+  logging color 0
+  logging print category 1
+  logging timestamp 1
+  logging level all everything
+  logging level lglobal notice
+  logging level llapd notice
+  logging level linp notice
+  logging level lmux notice
+  logging level lmi notice
+  logging level lmib notice
+  logging level lsms notice
+  logging level lctrl notice
+  logging level lgtp notice
+  logging level lstats notice
+  logging level lgsup notice
+  logging level loap notice
+  logging level lss7 debug
+  logging level lsccp debug
+  logging level lsua debug
+  logging level lm3ua debug
+  logging level lmgcp notice
+!
+line vty
+ no login
+!
+cs7 instance 0
+ xua rkm routing-key-allocation dynamic-permitted
+ asp virt-bsc0-0 23906 2905 m3ua
+  local-ip 127.0.0.1
+  remote-ip 127.0.0.1
+ as virt-bsc0 m3ua
+  asp virt-bsc0-0
+  routing-key 0 0.24.1
+ asp virt-bsc1-0 23907 2905 m3ua
+  local-ip 127.0.0.1
+  remote-ip 127.0.0.1
+ as virt-bsc1 m3ua
+  asp virt-bsc1-0
+  routing-key 1 0.24.2
+ route-table system
+  update route 0.24.1 7.255.7 linkset virt-bsc0
+  update route 0.24.2 7.255.7 linkset virt-bsc1
+ listen m3ua 2905
+  accept-asp-connections dynamic-permitted
+ listen ipa 5000
+  accept-asp-connections dynamic-permitted