diff --git a/ttcn3-pcu-test/PCU_Tests.cfg b/ttcn3-pcu-test/PCU_Tests.cfg
index 89c997e9..b5331f15 100644
--- a/ttcn3-pcu-test/PCU_Tests.cfg
+++ b/ttcn3-pcu-test/PCU_Tests.cfg
@@ -15,11 +15,15 @@
 PCU_Tests.mp_pcu_sock_path := "/data/unix/pcu_bts"
 PCU_Tests.mp_pcu_statsd_ip := "172.18.13.10"
 SGSN_Components.mp_nsconfig := {
-	address_family := AF_INET,
-	local_ip := "172.18.13.10",
-	local_udp_port := 23000,
-	remote_ip := "172.18.13.101",
-	remote_udp_port := 23000,
+	provider := {
+		ip := {
+			address_family := AF_INET,
+			local_ip := "172.18.13.10",
+			local_udp_port := 23000,
+			remote_ip := "172.18.13.101",
+			remote_udp_port := 23000
+		}
+	},
 	nsvci := 1234,
 	nsei := 1234
 }
diff --git a/ttcn3-pcu-test/sns/PCU_Tests.cfg b/ttcn3-pcu-test/sns/PCU_Tests.cfg
index f441d180..45b3fc76 100644
--- a/ttcn3-pcu-test/sns/PCU_Tests.cfg
+++ b/ttcn3-pcu-test/sns/PCU_Tests.cfg
@@ -9,11 +9,15 @@
 [MODULE_PARAMETERS]
 PCU_Tests.mp_pcu_sock_path := "/data/unix/pcu_bts"
 SGSN_Components.mp_nsconfig := {
-	address_family := AF_INET,
-	local_ip := "172.18.14.10",
-	local_udp_port := 23000,
-	remote_ip := "172.18.14.101",
-	remote_udp_port := 23000,
+	provider := {
+		ip := {
+			address_family := AF_INET,
+			local_ip := "172.18.14.10",
+			local_udp_port := 23000,
+			remote_ip := "172.18.14.101",
+			remote_udp_port := 23000
+		}
+	},
 	nsvci := 1234,
 	nsei := 1234
 }
diff --git a/ttcn3-sgsn-test/SGSN_Tests.cfg b/ttcn3-sgsn-test/SGSN_Tests.cfg
index 055ae5ab..612fe037 100644
--- a/ttcn3-sgsn-test/SGSN_Tests.cfg
+++ b/ttcn3-sgsn-test/SGSN_Tests.cfg
@@ -14,19 +14,31 @@
 [MODULE_PARAMETERS]
 SGSN_Tests.mp_nsconfig := {
 	{
-		address_family := AF_INET,
-		local_ip := "172.18.8.103",
-		remote_ip := "172.18.8.10"
+		provider := {
+			ip := {
+				address_family := AF_INET,
+				local_ip := "172.18.8.103",
+				remote_ip := "172.18.8.10"
+			}
+		}
 	},
 	{
-		address_family := AF_INET,
-		local_ip := "172.18.8.103",
-		remote_ip := "172.18.8.10"
+		provider := {
+			ip := {
+				address_family := AF_INET,
+				local_ip := "172.18.8.103",
+				remote_ip := "172.18.8.10"
+			}
+		}
 	},
 	{
-		address_family := AF_INET,
-		local_ip := "172.18.8.103",
-		remote_ip := "172.18.8.10"
+		provider := {
+			ip := {
+				address_family := AF_INET,
+				local_ip := "172.18.8.103",
+				remote_ip := "172.18.8.10"
+			}
+		}
 	}
 }
 SGSN_Tests.mp_ranap_cfg := {