diff --git a/suites/aoip_smpp/esme_connect_policy_acceptall.py b/suites/aoip_smpp/esme_connect_policy_acceptall.py
index 2a954d5..34516a3 100755
--- a/suites/aoip_smpp/esme_connect_policy_acceptall.py
+++ b/suites/aoip_smpp/esme_connect_policy_acceptall.py
@@ -4,7 +4,7 @@
 # * SMPP interface of SMSC accepts SMPP clients (ESMEs) which do not appear on
 #   the config file
 
-from osmo_gsm_tester.test import *
+from osmo_gsm_tester.testenv import *
 
 hlr = suite.hlr()
 bts = suite.bts() # bts not started, only needed for mgcpgw
diff --git a/suites/aoip_smpp/esme_connect_policy_closed.py b/suites/aoip_smpp/esme_connect_policy_closed.py
index 29b25d1..79cb0c7 100755
--- a/suites/aoip_smpp/esme_connect_policy_closed.py
+++ b/suites/aoip_smpp/esme_connect_policy_closed.py
@@ -6,7 +6,7 @@
 # * SMPP interface of SMSC rejects ESMEs with known system id but wrong password.
 # * SMPP interface of SMSC rejects ESEMs with unknown system id
 
-from osmo_gsm_tester.test import *
+from osmo_gsm_tester.testenv import *
 
 SMPP_ESME_RINVPASWD = 0x0000000E
 SMPP_ESME_RINVSYSID = 0x0000000F
diff --git a/suites/aoip_smpp/esme_ms_sms_storeforward.py b/suites/aoip_smpp/esme_ms_sms_storeforward.py
index d49401f..f0d5dd5 100755
--- a/suites/aoip_smpp/esme_ms_sms_storeforward.py
+++ b/suites/aoip_smpp/esme_ms_sms_storeforward.py
@@ -8,7 +8,7 @@
 # * When SMS is sent in 'store & forward' mode, ESME can send an SMS to an already registered MS.
 # * When SMS is sent in 'store & forward' mode, ESME receives a SMS receipt if it asked for it.
 
-from osmo_gsm_tester.test import *
+from osmo_gsm_tester.testenv import *
 
 SMPP_ESME_RINVDSTADR = 0x0000000B
 
diff --git a/suites/aoip_smpp/esme_ms_sms_transaction.py b/suites/aoip_smpp/esme_ms_sms_transaction.py
index 6892a7e..2b12829 100755
--- a/suites/aoip_smpp/esme_ms_sms_transaction.py
+++ b/suites/aoip_smpp/esme_ms_sms_transaction.py
@@ -6,7 +6,7 @@
 # * When SMS is sent in 'transaction' mode, ESME can send an SMS to an already registered MS.
 # * When SMS is sent in 'transaction' mode, ESME fails to send an SMS to non registered MS.
 
-from osmo_gsm_tester.test import *
+from osmo_gsm_tester.testenv import *
 
 SMPP_ESME_RINVDSTADR = 0x0000000B