diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn
index 833f317..439ffea 100644
--- a/pcu/PCU_Tests.ttcn
+++ b/pcu/PCU_Tests.ttcn
@@ -5647,16 +5647,6 @@
 	var GsmArfcn req_arfcn := 862;
 	var uint6_t req_bsic := 43;
 	var boolean use_old_ctrl_iface := mp_ctrl_neigh_ip != "";
-	var BssgpCellId src := valueof(ts_BssgpCellId(ts_RAI(ts_LAI(f_build_BcdMccMnc_int(info_ind.mcc, info_ind.mnc, info_ind.mnc_3_digits == 1), /* '262F42'H */
-								    info_ind.lac),
-							     info_ind.rac),
-						      info_ind.cell_id));
-	var BssgpCellId dst := valueof(ts_BssgpCellId(ts_RAI(ts_LAI('023F43'H, /* Decided by test itself (emulating BSC) */
-								    423),
-							     2),
-						      5));
-	var template RIM_Routing_Address src_addr := t_RIM_Routing_Address_cid(src);
-	var template RIM_Routing_Address dst_addr := t_RIM_Routing_Address_cid(dst);
 
 	if (use_old_ctrl_iface) {
 		/* Initialize osmo-bsc emulation neighbor resolution CTRL port */
@@ -5692,9 +5682,7 @@
 	f_handle_nacc_rac_ci_query(info_ind, req_arfcn, req_bsic, true, use_old_ctrl_iface);
 
 	/* RIM procedure: */
-	RIM.receive(tr_RAN_INFORMATION_REQUEST(tr_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, dst_addr),
-							   tr_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, src_addr),
-							   tr_RAN_Information_Request_RIM_Container));
+	as_outbound_nacc_rim_resolve(info_ind, do_answer := false);
 	/* We never answer the RIM procude -> PCU timeouts and should send Pkt Cell Chg continue */
 
 	/* Wait until we receive something non-dummy */