diff --git a/suites/sms/mo_mt_sms.py b/suites/sms/mo_mt_sms.py
index 10897ff..7654ea6 100755
--- a/suites/sms/mo_mt_sms.py
+++ b/suites/sms/mo_mt_sms.py
@@ -1,30 +1,41 @@
 #!/usr/bin/env python3
 from osmo_gsm_tester.testenv import *
 
-nitb = suite.nitb()
+hlr = suite.hlr()
 bts = suite.bts()
+mgw_msc = suite.mgw()
+mgw_bsc = suite.mgw()
+stp = suite.stp()
+msc = suite.msc(hlr, mgw_msc, stp)
+bsc = suite.bsc(msc, mgw_bsc, stp)
 ms_mo = suite.modem()
 ms_mt = suite.modem()
 
-print('start nitb and bts...')
-nitb.bts_add(bts)
-nitb.start()
+hlr.start()
+stp.start()
+msc.start()
+mgw_msc.start()
+mgw_bsc.start()
+
+bsc.bts_add(bts)
+bsc.start()
+
 bts.start()
-wait(nitb.bts_is_connected, bts)
+wait(bsc.bts_is_connected, bts)
 
-nitb.subscriber_add(ms_mo)
-nitb.subscriber_add(ms_mt)
+hlr.subscriber_add(ms_mo)
+hlr.subscriber_add(ms_mt)
 
-ms_mo.connect(nitb.mcc_mnc())
-ms_mt.connect(nitb.mcc_mnc())
+ms_mo.connect(msc.mcc_mnc())
+ms_mt.connect(msc.mcc_mnc())
 
 ms_mo.log_info()
 ms_mt.log_info()
 
 print('waiting for modems to attach...')
-wait(ms_mo.is_connected, nitb.mcc_mnc())
-wait(ms_mt.is_connected, nitb.mcc_mnc())
-wait(nitb.subscriber_attached, ms_mo, ms_mt)
+wait(ms_mo.is_connected, msc.mcc_mnc())
+wait(ms_mt.is_connected, msc.mcc_mnc())
+wait(msc.subscriber_attached, ms_mo, ms_mt)
 
 sms = ms_mo.sms_send(ms_mt)
 wait(ms_mt.sms_was_received, sms)
diff --git a/suites/sms/suite.conf b/suites/sms/suite.conf
index 485402b..28a81ea 100644
--- a/suites/sms/suite.conf
+++ b/suites/sms/suite.conf
@@ -1,12 +1,9 @@
 resources:
   ip_address:
-  - times: 1
+  - times: 6 # msc, bsc, hlr, stp, mgw*2
   bts:
   - times: 1
   modem:
   - times: 2
     features:
     - sms
-
-defaults:
-  timeout: 60s