diff --git a/gprs_gb/Test.cfg b/gprs_gb/Test.cfg
index 2f11dfb..2c2ffb8 100644
--- a/gprs_gb/Test.cfg
+++ b/gprs_gb/Test.cfg
@@ -1,5 +1,8 @@
+[ORDERED_INCLUDE]
+# Common configuration, shared between test suites
+"../Common.cfg"
+
 [LOGGING]
-SourceInfoFormat := Single;
 #*.FileMask := LOG_ALL
 ConsoleMask := ERROR | WARNING | TESTCASE | TIMEROP_START | DEBUG_ENCDEC
 
@@ -8,8 +11,26 @@
 #mp_local_udp_port := 23000
 #mp_remote_ip := "192.168.100.196"
 #mp_remote_udp_port := 21000
-mp_nsei := 96
-mp_bvci := 196
+NS_Emulation.mp_local_ip := "127.0.0.1"
+NS_Emulation.mp_local_udp_port := 23000
+NS_Emulation.mp_remote_ip := "127.0.0.1"
+NS_Emulation.mp_remote_udp_port := 23001
+NS_Emulation.mp_nsei := 1234
+NS_Emulation.mp_nsvci := 1234
+Test.mp_gb_cfg := {
+	nsei := 1234,
+	bvci := 1234,
+	cell_id := {
+		ra_id := {
+			lai := {
+				mcc_mnc := '00101F'H, lac := 1
+			},
+			rac := 0
+		},
+		cell_id := 0
+	},
+	sgsn_role := true
+}
 
 [TESTPORT_PARAMETERS]
 #*.BSCVTY.CTRL_MODE := "client"