diff --git a/ttcn3-gbproxy-test/GBProxy_Tests.cfg b/ttcn3-gbproxy-test/GBProxy_Tests.cfg
index 7f6c3037..6b097a34 100644
--- a/ttcn3-gbproxy-test/GBProxy_Tests.cfg
+++ b/ttcn3-gbproxy-test/GBProxy_Tests.cfg
@@ -14,44 +14,58 @@
 [MODULE_PARAMETERS]
 GBProxy_Tests.mp_nsconfig_sgsn := {
 	{
-		provider := {
-			ip := {
-				address_family := AF_INET,
-				local_ip := "172.18.24.103",
-				local_udp_port := 23000,
-				remote_ip := "172.18.24.10"
+		nsvc := {
+			{
+				provider := {
+					ip := {
+						address_family := AF_INET,
+						local_ip := "172.18.24.103",
+						local_udp_port := 23000,
+						remote_ip := "172.18.24.10"
+					}
+				}
 			}
 		}
 	}
 }
 GBProxy_Tests.mp_nsconfig_pcu := {
-	    {
-			provider := {
-				ip := {
-					address_family := AF_INET,
-					local_ip := "172.18.24.103",
-					remote_ip := "172.18.24.10"
-				}
-			}
-		},
-        {
-			provider := {
-				ip := {
-					address_family := AF_INET,
-					local_ip := "172.18.24.103",
-					remote_ip := "172.18.24.10"
-				}
-			}
-		},
-        {
-			provider := {
-				ip := {
-					address_family := AF_INET,
-					local_ip := "172.18.24.103",
-					remote_ip := "172.18.24.10"
+	{
+		nsvc := {
+			{
+				provider := {
+					ip := {
+						address_family := AF_INET,
+						local_ip := "172.18.24.103",
+						remote_ip := "172.18.24.10"
+					}
 				}
 			}
 		}
+	}, {
+		nsvc := {
+			{
+				provider := {
+					ip := {
+						address_family := AF_INET,
+						local_ip := "172.18.24.103",
+						remote_ip := "172.18.24.10"
+					}
+				}
+			}
+		}
+	}, {
+		nsvc := {
+			{
+				provider := {
+					ip := {
+						address_family := AF_INET,
+						local_ip := "172.18.24.103",
+						remote_ip := "172.18.24.10"
+					}
+				}
+			}
+		}
+	}
 }
 
 [MAIN_CONTROLLER]
diff --git a/ttcn3-pcu-test/PCU_Tests.cfg b/ttcn3-pcu-test/PCU_Tests.cfg
index 4bf29061..9e69f860 100644
--- a/ttcn3-pcu-test/PCU_Tests.cfg
+++ b/ttcn3-pcu-test/PCU_Tests.cfg
@@ -15,18 +15,22 @@
 PCU_Tests.mp_pcu_sock_path := "/data/unix/pcu_bts"
 PCU_Tests.mp_pcu_statsd_ip := "172.18.13.10"
 SGSN_Components.mp_nsconfig := {
-	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,
-	handle_sns := false
+	handle_sns := false,
+	nsvc := {
+		{
+			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
+		}
+	}
 }
 Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoPCU";
 StatsD_Checker.mp_enable_stats := true;
diff --git a/ttcn3-pcu-test/sns/PCU_Tests.cfg b/ttcn3-pcu-test/sns/PCU_Tests.cfg
index 45b3fc76..9cd4b38b 100644
--- a/ttcn3-pcu-test/sns/PCU_Tests.cfg
+++ b/ttcn3-pcu-test/sns/PCU_Tests.cfg
@@ -9,17 +9,21 @@
 [MODULE_PARAMETERS]
 PCU_Tests.mp_pcu_sock_path := "/data/unix/pcu_bts"
 SGSN_Components.mp_nsconfig := {
-	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
+	nsei := 1234,
+	nsvc := {
+		{
+			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
 		}
-	},
-	nsvci := 1234,
-	nsei := 1234
+	}
 }
 
 [MAIN_CONTROLLER]
diff --git a/ttcn3-sgsn-test/SGSN_Tests.cfg b/ttcn3-sgsn-test/SGSN_Tests.cfg
index 612fe037..b77fffd6 100644
--- a/ttcn3-sgsn-test/SGSN_Tests.cfg
+++ b/ttcn3-sgsn-test/SGSN_Tests.cfg
@@ -14,29 +14,41 @@
 [MODULE_PARAMETERS]
 SGSN_Tests.mp_nsconfig := {
 	{
-		provider := {
-			ip := {
-				address_family := AF_INET,
-				local_ip := "172.18.8.103",
-				remote_ip := "172.18.8.10"
+		nsvc := {
+			{
+				provider := {
+					ip := {
+						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"
+		nsvc := {
+			{
+				provider := {
+					ip := {
+						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"
+		nsvc := {
+			{
+				provider := {
+					ip := {
+						address_family := AF_INET,
+						local_ip := "172.18.8.103",
+						remote_ip := "172.18.8.10"
+					}
+				}
 			}
 		}
 	}