diff --git a/mme/MME_Tests.ttcn b/mme/MME_Tests.ttcn
index c931449..bcf53d1 100644
--- a/mme/MME_Tests.ttcn
+++ b/mme/MME_Tests.ttcn
@@ -192,7 +192,13 @@
 	charstring mp_gn_local_ip := "127.0.0.22";
 	integer mp_gn_local_port := 2123;
 	charstring mp_gn_remote_ip := "127.0.0.2";
+	/* RAI+CI served from emulated peer SGSN: */
 	integer mp_gn_remote_port := 2123;
+	hexstring mp_gn_local_mcc := '262'H;
+	hexstring mp_gn_local_mnc := 'f42'H;
+	uint16_t mp_gn_local_lac := 43690;
+	uint8_t mp_gn_local_rac := 187;
+	uint16_t mp_gn_local_ci := 1223;
 
 	/* S11 interface (GTPv2C, interface between MME and SGW) */
 	charstring mp_s11_local_ip := "127.0.0.3";
@@ -1171,10 +1177,10 @@
 	var GTP_CellId geran_gtp_ci;
 
 	/* Assemble data of a fictitiously GERAN cell */
-	geran_gtp_ci.ra_id.rac := oct2int('BB'O);
-	geran_gtp_ci.ra_id.lai.mcc_mnc := '262f42'H
-	geran_gtp_ci.ra_id.lai.lac := oct2int('AAAA'O);
-	geran_gtp_ci.cell_id := oct2int('04C7'O);
+	geran_gtp_ci.ra_id.rac := mp_gn_local_rac;
+	geran_gtp_ci.ra_id.lai.mcc_mnc := mp_gn_local_mcc & mp_gn_local_mnc;
+	geran_gtp_ci.ra_id.lai.lac := mp_gn_local_lac;
+	geran_gtp_ci.cell_id := mp_gn_local_ci;
 	const octetstring geran_si1 := '198fb100000000000000000000000000007900002b'O;
 	const octetstring geran_si3 := '1b753000f110236ec9033c2747407900003c0b2b2b'O;
 	const octetstring geran_si13 := '009000185a6fc9e08410ab2b2b2b2b2b2b2b2b2b2b'O;