diff --git a/sysmocom/suites/4g/handover.py b/sysmocom/suites/4g/handover.py
index bc49266..8bfb585 100755
--- a/sysmocom/suites/4g/handover.py
+++ b/sysmocom/suites/4g/handover.py
@@ -46,7 +46,7 @@
 proc = iperf3cli.prepare_test_proc(iperf3cli.DIR_UL, ue.netns(), duration + 30)
 
 print('waiting for UE to attach...')
-wait(ue.is_rrc_connected)
+wait(ue.is_registered)
 print('UE is attached')
 
 rfemu_cell1 = enb.get_rfemu(0)
diff --git a/sysmocom/suites/4g/iperf3_dl.py b/sysmocom/suites/4g/iperf3_dl.py
index 055ce97..26df79b 100755
--- a/sysmocom/suites/4g/iperf3_dl.py
+++ b/sysmocom/suites/4g/iperf3_dl.py
@@ -26,7 +26,7 @@
 proc = iperf3cli.prepare_test_proc(iperf3cli.DIR_DL, ue.netns(), bitrate=max_rate)
 
 print('waiting for UE to attach...')
-wait(ue.is_rrc_connected)
+wait(ue.is_registered)
 print('UE is attached')
 
 print("Running iperf3 client to %s through %s" % (str(iperf3cli), ue.netns()))
diff --git a/sysmocom/suites/4g/iperf3_ul.py b/sysmocom/suites/4g/iperf3_ul.py
index 6e24070..15cde95 100755
--- a/sysmocom/suites/4g/iperf3_ul.py
+++ b/sysmocom/suites/4g/iperf3_ul.py
@@ -26,7 +26,7 @@
 proc = iperf3cli.prepare_test_proc(iperf3cli.DIR_UL, ue.netns(), bitrate=max_rate)
 
 print('waiting for UE to attach...')
-wait(ue.is_rrc_connected)
+wait(ue.is_registered)
 print('UE is attached')
 
 print("Running iperf3 client to %s through %s" % (str(iperf3cli), ue.netns()))
diff --git a/sysmocom/suites/4g/ping.py b/sysmocom/suites/4g/ping.py
index 0fb2edb..0297317 100755
--- a/sysmocom/suites/4g/ping.py
+++ b/sysmocom/suites/4g/ping.py
@@ -16,7 +16,7 @@
 
 ue.connect(enb)
 print('waiting for UE to attach...')
-wait(ue.is_rrc_connected)
+wait(ue.is_registered)
 print('UE is attached')
 
 proc = ue.run_netns_wait('ping', ('ping', '-c', '10', epc.tun_addr()))
diff --git a/sysmocom/suites/4g/rrc_idle_mo_ping.py b/sysmocom/suites/4g/rrc_idle_mo_ping.py
index de643df..ced798d 100755
--- a/sysmocom/suites/4g/rrc_idle_mo_ping.py
+++ b/sysmocom/suites/4g/rrc_idle_mo_ping.py
@@ -16,7 +16,7 @@
 
 ue.connect(enb)
 print('waiting for UE to attach...')
-wait(ue.is_rrc_connected)
+wait(ue.is_registered)
 print('UE is RRC connected')
 
 print('waiting until RRC connection gets released...')
diff --git a/sysmocom/suites/4g/rrc_idle_mt_ping.py b/sysmocom/suites/4g/rrc_idle_mt_ping.py
index 7caba32..fb3c32c 100755
--- a/sysmocom/suites/4g/rrc_idle_mt_ping.py
+++ b/sysmocom/suites/4g/rrc_idle_mt_ping.py
@@ -16,7 +16,7 @@
 
 ue.connect(enb)
 print('waiting for UE to attach...')
-wait(ue.is_rrc_connected)
+wait(ue.is_registered)
 print('UE is RRC connected')
 
 print('waiting until RRC connection gets released...')