diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn
index f07042934..eb1fff2cc 100644
--- a/sgsn/SGSN_Tests.ttcn
+++ b/sgsn/SGSN_Tests.ttcn
@@ -677,7 +677,9 @@ function f_upd_ptmsi_and_tlli(OCT4 p_tmsi, integer ran_index := 0) runs on BSSGP
 	/* update TLLI */
 	g_pars.tlli_old := g_pars.tlli;
 	g_pars.tlli := g_pars.p_tmsi or4b 'c0000000'O;
-	f_bssgp_client_llgmm_assign(g_pars.tlli_old, g_pars.tlli, BSSGP_PROC[ran_index]);
+	if (is_gb(ran_index)) {
+		f_bssgp_client_llgmm_assign(g_pars.tlli_old, g_pars.tlli, BSSGP_PROC[ran_index]);
+	}
 }
 
 function f_process_attach_accept(PDU_GMM_AttachAccept aa) runs on BSSGP_ConnHdlr {
@@ -2407,6 +2409,7 @@ friend function f_routing_area_update(RoutingAreaIdentificationV ra, integer ran
 			var IntegrityProtectionAlgorithm uia_chosen := 0; /* 0 = standard_UMTS_integrity_algorithm_UIA1 */
 			BSSAP.send(ts_RANAP_SecurityModeComplete(uia_chosen));
 			BSSAP.receive(tr_RANAP_CommonId(imsi_hex2oct(g_pars.imsi)))
+			repeat;
 		}
 	[is_gb(ran_index)] BSSGP[ran_index].receive { repeat; }
 	[is_iu(ran_index)] BSSAP.receive { repeat; }