diff --git a/suites/smpp/esme_connect_policy_closed.py b/suites/smpp/esme_connect_policy_closed.py
index eaabb3d..487e5a4 100755
--- a/suites/smpp/esme_connect_policy_closed.py
+++ b/suites/smpp/esme_connect_policy_closed.py
@@ -11,8 +11,13 @@
 SMPP_ESME_RINVPASWD = 0x0000000E
 SMPP_ESME_RINVSYSID = 0x0000000F
 
-nitb = suite.nitb()
-smsc = nitb.smsc
+hlr = suite.hlr()
+bts = suite.bts()
+mgw_msc = suite.mgw()
+stp = suite.stp()
+msc = suite.msc(hlr, mgw_msc, stp)
+smsc = msc.smsc
+
 esme = suite.esme()
 esme_no_pwd = suite.esme()
 esme_no_pwd.set_password('')
@@ -21,7 +26,10 @@
 smsc.esme_add(esme)
 smsc.esme_add(esme_no_pwd)
 
-nitb.start()
+stp.start()
+hlr.start()
+msc.start()
+mgw_msc.start()
 
 log('Test with correct credentials (no password)')
 esme_no_pwd.connect()