diff --git a/sgsn/SGSN_Tests.cfg b/sgsn/SGSN_Tests.cfg
index 8782845ea..516775029 100644
--- a/sgsn/SGSN_Tests.cfg
+++ b/sgsn/SGSN_Tests.cfg
@@ -9,8 +9,30 @@
 [LOGGING]
 
 [TESTPORT_PARAMETERS]
+*.SGSNVTY.CTRL_HOSTNAME := "127.0.0.10"
 
 [MODULE_PARAMETERS]
+SGSN_Tests.mp_nsconfig := {
+	{
+		local_ip := "127.0.0.103",
+		remote_ip := "127.0.0.10"
+	},
+	{
+		local_ip := "127.0.0.103",
+		remote_ip := "127.0.0.10"
+	},
+	{
+		local_ip := "127.0.0.103",
+		remote_ip := "127.0.0.10"
+	}
+}
+SGSN_Tests.mp_ranap_cfg := {
+	{
+		sctp_addr := { 23908, "127.0.0.103", 2905, "127.0.0.200" }
+	}
+}
+SGSN_Tests.mp_hlr_ip := "127.0.0.103"
+SGSN_Tests.mp_ggsn_ip := "127.0.0.103"
 
 [MAIN_CONTROLLER]
 
diff --git a/sgsn/osmo-sgsn.cfg b/sgsn/osmo-sgsn.cfg
index 09da510ac..7ac50bccb 100644
--- a/sgsn/osmo-sgsn.cfg
+++ b/sgsn/osmo-sgsn.cfg
@@ -28,10 +28,17 @@ stats interval 5
 !
 line vty
  no login
- bind 127.0.0.1
+ bind 127.0.0.10
 ctrl
- bind 127.0.0.1
+ bind 127.0.0.10
 !
+cs7 instance 0
+ point-code 0.23.4
+ asp asp-clnt-OsmoSGSN-A 2905 0 m3ua
+  remote-ip 127.0.0.200
+ as as-clnt-OsmoSGSN-A m3ua
+  asp asp-clnt-OsmoSGSN-A
+  routing-key 3 0.23.4
 ns
  timer tns-block 3
  timer tns-block-retries 3
@@ -40,15 +47,15 @@ ns
  timer tns-test 30
  timer tns-alive 3
  timer tns-alive-retries 10
- encapsulation udp local-ip 127.0.0.1
+ encapsulation udp local-ip 127.0.0.10
  encapsulation udp local-port 23000
  encapsulation framerelay-gre enabled 0
 bssgp
 sgsn
- gtp local-ip 127.0.0.1
- ggsn 0 remote-ip 127.0.0.2
+ gtp local-ip 127.0.0.10
+ ggsn 0 remote-ip 127.0.0.103
  ggsn 0 gtp-version 1
- gsup remote-ip 127.0.0.1
+ gsup remote-ip 127.0.0.103
  gsup remote-port 4222
  auth-policy remote
  gsup oap-id 0
diff --git a/sgsn/osmo-stp.cfg b/sgsn/osmo-stp.cfg
new file mode 100644
index 000000000..b42f967aa
--- /dev/null
+++ b/sgsn/osmo-stp.cfg
@@ -0,0 +1,36 @@
+!
+! OsmoSTP (0.8.1) configuration saved from vty
+!!
+!
+log gsmtap 127.0.0.1
+ logging level set-all debug
+!
+log stderr
+ logging color 1
+ logging filter all 1
+ logging print level 1
+ logging print category 1
+ logging print category-hex 0
+ logging print file basename last
+ logging print extended-timestamp 1
+ logging level set-all debug
+!
+line vty
+ no login
+!
+cs7 instance 0
+ xua rkm routing-key-allocation dynamic-permitted
+ asp virt-rnc0-0 23908 2905 m3ua
+  local-ip 127.0.0.200
+  remote-ip 127.0.0.103
+ as virt-rnc0 m3ua
+  asp virt-rnc0-0
+  routing-key 2 0.24.3
+ route-table system
+  update route 0.24.3 7.255.7 linkset virt-rnc0
+ listen m3ua 2905
+  local-ip 127.0.0.200
+  accept-asp-connections dynamic-permitted
+ listen ipa 5000
+  local-ip 127.0.0.200
+  accept-asp-connections dynamic-permitted