diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn
index 30bb6f1..15d4341 100644
--- a/epdg/EPDG_Tests.ttcn
+++ b/epdg/EPDG_Tests.ttcn
@@ -18,6 +18,7 @@
 
 import from DIAMETER_Types all;
 import from DIAMETER_Templates all;
+import from DIAMETER_rfc4004_Templates all;
 import from DIAMETER_ts29_273_Templates all;
 import from DIAMETER_Emulation all;
 
@@ -434,6 +435,9 @@
 	var PDU_DIAMETER rx_dia;
 	var UINT32 hbh_id := f_rnd_octstring(4);
 	var UINT32 ete_id := f_rnd_octstring(4);
+	var template (value) MIPv4_NONE_MIP_Home_Agent_Address pgw_addr;
+
+	pgw_addr := ts_AVP_Home_Agent_Address(IP, f_inet_addr(mp_s2b_local_ip));
 
 	/* Unlike AAR, AAA contains no IMSI. Register ete_id in DIAMETER_Emulation,
 	 * so AIA is forwarded back to us in DIAMETER port instead of MTC_CT.DIAMETER_UNIT.
@@ -442,7 +446,9 @@
 
 	S6b.send(ts_DIA_S6b_AAR(f_nai(),
 				int2oct(DIA_TS29_373_MIP6_Feature_Vector_GTPv2_SUPPORTED, 8),
-				g_pars.apn, hbh_id := hbh_id, ete_id := ete_id));
+				g_pars.apn,
+				pgw_addr,
+				hbh_id := hbh_id, ete_id := ete_id));
 
 	/* AAR in S6b in AAA-Server triggers Service-Assignment Request/Answer towards HSS: */
 	as_DIA_SWx_SA_success();