diff --git a/sysmocom/suites/4g/iperf3_dl.py b/sysmocom/suites/4g/iperf3_dl.py
index 88ae82d..d4fa649 100755
--- a/sysmocom/suites/4g/iperf3_dl.py
+++ b/sysmocom/suites/4g/iperf3_dl.py
@@ -12,10 +12,10 @@
     print_result_node(cli_res, 'client')
     print_result_node(srv_res, 'server')
 
-epc = suite.epc()
-enb = suite.enb()
-ue = suite.modem()
-iperf3srv = suite.iperf3srv({'addr': epc.tun_addr()})
+epc = tenv.epc()
+enb = tenv.enb()
+ue = tenv.modem()
+iperf3srv = tenv.iperf3srv({'addr': epc.tun_addr()})
 iperf3srv.set_run_node(epc.run_node())
 iperf3cli = iperf3srv.create_client()
 iperf3cli.set_run_node(ue.run_node())
diff --git a/sysmocom/suites/4g/iperf3_ul.py b/sysmocom/suites/4g/iperf3_ul.py
index 597b50d..64d476b 100755
--- a/sysmocom/suites/4g/iperf3_ul.py
+++ b/sysmocom/suites/4g/iperf3_ul.py
@@ -12,10 +12,10 @@
     print_result_node(cli_res, 'client')
     print_result_node(srv_res, 'server')
 
-epc = suite.epc()
-enb = suite.enb()
-ue = suite.modem()
-iperf3srv = suite.iperf3srv({'addr': epc.tun_addr()})
+epc = tenv.epc()
+enb = tenv.enb()
+ue = tenv.modem()
+iperf3srv = tenv.iperf3srv({'addr': epc.tun_addr()})
 iperf3srv.set_run_node(epc.run_node())
 iperf3cli = iperf3srv.create_client()
 iperf3cli.set_run_node(ue.run_node())
diff --git a/sysmocom/suites/4g/ping.py b/sysmocom/suites/4g/ping.py
index 17eee78..c81a35d 100755
--- a/sysmocom/suites/4g/ping.py
+++ b/sysmocom/suites/4g/ping.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python3
 from osmo_gsm_tester.testenv import *
 
-epc = suite.epc()
-enb = suite.enb()
-ue = suite.modem()
+epc = tenv.epc()
+enb = tenv.enb()
+ue = tenv.modem()
 
 epc.subscriber_add(ue)
 epc.start()