diff --git a/sysmocom/suites/nitb_smpp/esme_connect_policy_acceptall.py b/sysmocom/suites/nitb_smpp/esme_connect_policy_acceptall.py
index 904226b..85abb9b 100755
--- a/sysmocom/suites/nitb_smpp/esme_connect_policy_acceptall.py
+++ b/sysmocom/suites/nitb_smpp/esme_connect_policy_acceptall.py
@@ -6,9 +6,9 @@
 
 from osmo_gsm_tester.testenv import *
 
-nitb = suite.nitb()
+nitb = tenv.nitb()
 smsc = nitb.smsc
-esme = suite.esme()
+esme = tenv.esme()
 
 # Here we deliberately omit calling smsc.esme_add() to avoid having it included
 # in the smsc config.
diff --git a/sysmocom/suites/nitb_smpp/esme_connect_policy_closed.py b/sysmocom/suites/nitb_smpp/esme_connect_policy_closed.py
index eaabb3d..41a74f2 100755
--- a/sysmocom/suites/nitb_smpp/esme_connect_policy_closed.py
+++ b/sysmocom/suites/nitb_smpp/esme_connect_policy_closed.py
@@ -11,10 +11,10 @@
 SMPP_ESME_RINVPASWD = 0x0000000E
 SMPP_ESME_RINVSYSID = 0x0000000F
 
-nitb = suite.nitb()
+nitb = tenv.nitb()
 smsc = nitb.smsc
-esme = suite.esme()
-esme_no_pwd = suite.esme()
+esme = tenv.esme()
+esme_no_pwd = tenv.esme()
 esme_no_pwd.set_password('')
 
 smsc.set_smsc_policy(smsc.SMSC_POLICY_CLOSED)
diff --git a/sysmocom/suites/nitb_smpp/esme_ms_sms_storeforward.py b/sysmocom/suites/nitb_smpp/esme_ms_sms_storeforward.py
index 391a040..29a5ced 100755
--- a/sysmocom/suites/nitb_smpp/esme_ms_sms_storeforward.py
+++ b/sysmocom/suites/nitb_smpp/esme_ms_sms_storeforward.py
@@ -12,10 +12,10 @@
 
 SMPP_ESME_RINVDSTADR = 0x0000000B
 
-nitb = suite.nitb()
-bts = suite.bts()
-ms = suite.modem()
-esme = suite.esme()
+nitb = tenv.nitb()
+bts = tenv.bts()
+ms = tenv.modem()
+esme = tenv.esme()
 
 print('start nitb and bts...')
 nitb.bts_add(bts)
diff --git a/sysmocom/suites/nitb_smpp/esme_ms_sms_transaction.py b/sysmocom/suites/nitb_smpp/esme_ms_sms_transaction.py
index adc9dae..2963b6e 100755
--- a/sysmocom/suites/nitb_smpp/esme_ms_sms_transaction.py
+++ b/sysmocom/suites/nitb_smpp/esme_ms_sms_transaction.py
@@ -10,10 +10,10 @@
 
 SMPP_ESME_RINVDSTADR = 0x0000000B
 
-nitb = suite.nitb()
-bts = suite.bts()
-ms = suite.modem()
-esme = suite.esme()
+nitb = tenv.nitb()
+bts = tenv.bts()
+ms = tenv.modem()
+esme = tenv.esme()
 
 print('start nitb and bts...')
 nitb.bts_add(bts)