diff --git a/suites/aoip_encryption/register_a5_0_authopt.py b/suites/aoip_encryption/register_a5_0_authopt.py
index 0224ee0..6e5e459 100755
--- a/suites/aoip_encryption/register_a5_0_authopt.py
+++ b/suites/aoip_encryption/register_a5_0_authopt.py
@@ -4,8 +4,9 @@
 hlr = suite.hlr()
 bts = suite.bts()
 mgcpgw = suite.mgcpgw(bts_ip=bts.remote_addr())
+mgw_bsc = suite.mgw()
 msc = suite.msc(hlr, mgcpgw)
-bsc = suite.bsc(msc)
+bsc = suite.bsc(msc, mgw_bsc)
 stp = suite.stp()
 ms = suite.modem()
 
@@ -17,6 +18,7 @@
 stp.start()
 msc.start()
 mgcpgw.start()
+mgw_bsc.start()
 bsc.bts_add(bts)
 bsc.start()
 bts.start()
diff --git a/suites/aoip_encryption/register_a5_0_authreq.py b/suites/aoip_encryption/register_a5_0_authreq.py
index 114c628..428fc8d 100755
--- a/suites/aoip_encryption/register_a5_0_authreq.py
+++ b/suites/aoip_encryption/register_a5_0_authreq.py
@@ -4,8 +4,9 @@
 hlr = suite.hlr()
 bts = suite.bts()
 mgcpgw = suite.mgcpgw(bts_ip=bts.remote_addr())
+mgw_bsc = suite.mgw()
 msc = suite.msc(hlr, mgcpgw)
-bsc = suite.bsc(msc)
+bsc = suite.bsc(msc, mgw_bsc)
 stp = suite.stp()
 ms = suite.modem()
 
@@ -17,6 +18,7 @@
 stp.start()
 msc.start()
 mgcpgw.start()
+mgw_bsc.start()
 bsc.bts_add(bts)
 bsc.start()
 bts.start()
diff --git a/suites/aoip_encryption/register_a5_1_authreq.py b/suites/aoip_encryption/register_a5_1_authreq.py
index a84fa3a..59e3fac 100755
--- a/suites/aoip_encryption/register_a5_1_authreq.py
+++ b/suites/aoip_encryption/register_a5_1_authreq.py
@@ -4,8 +4,9 @@
 hlr = suite.hlr()
 bts = suite.bts()
 mgcpgw = suite.mgcpgw(bts_ip=bts.remote_addr())
+mgw_bsc = suite.mgw()
 msc = suite.msc(hlr, mgcpgw)
-bsc = suite.bsc(msc)
+bsc = suite.bsc(msc, mgw_bsc)
 stp = suite.stp()
 ms = suite.modem()
 
@@ -17,6 +18,7 @@
 stp.start()
 msc.start()
 mgcpgw.start()
+mgw_bsc.start()
 bsc.bts_add(bts)
 bsc.start()
 bts.start()
diff --git a/suites/aoip_encryption/suite.conf b/suites/aoip_encryption/suite.conf
index d6d0eee..18e94a3 100644
--- a/suites/aoip_encryption/suite.conf
+++ b/suites/aoip_encryption/suite.conf
@@ -1,6 +1,6 @@
 resources:
   ip_address:
-  - times: 5 # msc, bsc, hlr, stp, mgw
+  - times: 6 # msc, bsc, hlr, stp, mgw*2
   bts:
   - times: 1
     ciphers: