diff --git a/suites/aoip_encryption/register_a5_0_authopt.py b/suites/aoip_encryption/register_a5_0_authopt.py
new file mode 100755
index 0000000..ff93cb8
--- /dev/null
+++ b/suites/aoip_encryption/register_a5_0_authopt.py
@@ -0,0 +1,34 @@
+#!/usr/bin/env python3
+from osmo_gsm_tester.test import *
+
+hlr = suite.hlr()
+bts = suite.bts()
+mgcpgw = suite.mgcpgw(bts_ip=bts.remote_addr())
+msc = suite.msc(hlr, mgcpgw)
+bsc = suite.bsc(msc)
+stp = suite.stp()
+ms = suite.modem()
+
+print('start network...')
+msc.set_authentication(False)
+msc.set_encryption('a5 0')
+bsc.set_encryption('a5 0')
+hlr.start()
+stp.start()
+msc.start()
+mgcpgw.start()
+bsc.bts_add(bts)
+bsc.start()
+bts.start()
+
+ms.log_info()
+good_ki = ms.ki()
+bad_ki = ("%1X" % (int(good_ki[0], 16) ^ 0x01)) + good_ki[1:]
+
+print('KI changed: ' + good_ki + " => " + bad_ki)
+ms.set_ki(bad_ki)
+hlr.subscriber_add(ms)
+print('Attempt connection with wrong KI, should work as it is not used...')
+ms.connect(msc.mcc_mnc())
+wait(ms.is_connected, msc.mcc_mnc())
+wait(msc.subscriber_attached, ms)
diff --git a/suites/aoip_encryption/register_a5_0_authreq.py b/suites/aoip_encryption/register_a5_0_authreq.py
new file mode 100755
index 0000000..be8f8a1
--- /dev/null
+++ b/suites/aoip_encryption/register_a5_0_authreq.py
@@ -0,0 +1,47 @@
+#!/usr/bin/env python3
+from osmo_gsm_tester.test import *
+
+hlr = suite.hlr()
+bts = suite.bts()
+mgcpgw = suite.mgcpgw(bts_ip=bts.remote_addr())
+msc = suite.msc(hlr, mgcpgw)
+bsc = suite.bsc(msc)
+stp = suite.stp()
+ms = suite.modem()
+
+print('start network...')
+msc.set_authentication(True)
+msc.set_encryption('a5 0')
+bsc.set_encryption('a5 0')
+hlr.start()
+stp.start()
+msc.start()
+mgcpgw.start()
+bsc.bts_add(bts)
+bsc.start()
+bts.start()
+
+ms.log_info()
+good_ki = ms.ki()
+bad_ki = ("%1X" % (int(good_ki[0], 16) ^ 0x01)) + good_ki[1:]
+
+print('KI changed: ' + good_ki + " => " + bad_ki)
+ms.set_ki(bad_ki)
+hlr.subscriber_add(ms)
+print('Attempt connection with wrong KI...')
+ms.connect(msc.mcc_mnc())
+
+sleep(30) # TODO: read pcap or CTRL interface and look for Rejected? (gsm_a.dtap.msg_mm_type == 0x04)
+print('Asserting modem did not register')
+# FIXME: this can fail because ofono qmi signals registered before being accepted by network. See OS#2458
+# assert not ms.is_connected(msc.mcc_mnc())
+assert not msc.subscriber_attached(ms)
+
+hlr.subscriber_delete(ms)
+print('KI changed: ' + bad_ki + " => " + good_ki)
+ms.set_ki(good_ki)
+hlr.subscriber_add(ms, ms.msisdn)
+print('Attempt connection with correct KI...')
+ms.connect(msc.mcc_mnc())
+wait(ms.is_connected, msc.mcc_mnc())
+wait(msc.subscriber_attached, ms)
diff --git a/suites/aoip_encryption/register_a5_1_authreq.py b/suites/aoip_encryption/register_a5_1_authreq.py
new file mode 100755
index 0000000..dd41348
--- /dev/null
+++ b/suites/aoip_encryption/register_a5_1_authreq.py
@@ -0,0 +1,47 @@
+#!/usr/bin/env python3
+from osmo_gsm_tester.test import *
+
+hlr = suite.hlr()
+bts = suite.bts()
+mgcpgw = suite.mgcpgw(bts_ip=bts.remote_addr())
+msc = suite.msc(hlr, mgcpgw)
+bsc = suite.bsc(msc)
+stp = suite.stp()
+ms = suite.modem()
+
+print('start network...')
+msc.set_authentication(True)
+msc.set_encryption('a5 1')
+bsc.set_encryption('a5 1')
+hlr.start()
+stp.start()
+msc.start()
+mgcpgw.start()
+bsc.bts_add(bts)
+bsc.start()
+bts.start()
+
+ms.log_info()
+good_ki = ms.ki()
+bad_ki = ("%1X" % (int(good_ki[0], 16) ^ 0x01)) + good_ki[1:]
+
+print('KI changed: ' + good_ki + " => " + bad_ki)
+ms.set_ki(bad_ki)
+hlr.subscriber_add(ms)
+print('Attempt connection with wrong KI...')
+ms.connect(msc.mcc_mnc())
+
+sleep(30) # TODO: read pcap or CTRL interface and look for Rejected? (gsm_a.dtap.msg_mm_type == 0x04)
+print('Asserting modem did not register')
+# FIXME: this can fail because ofono qmi signals registered before being accepted by network. See OS#2458
+# assert not ms.is_connected(msc.mcc_mnc())
+assert not msc.subscriber_attached(ms)
+
+hlr.subscriber_delete(ms)
+print('KI changed: ' + bad_ki + " => " + good_ki)
+ms.set_ki(good_ki)
+hlr.subscriber_add(ms, ms.msisdn)
+print('Attempt connection with correct KI...')
+ms.connect(msc.mcc_mnc())
+wait(ms.is_connected, msc.mcc_mnc())
+wait(msc.subscriber_attached, ms)
diff --git a/suites/aoip_encryption/suite.conf b/suites/aoip_encryption/suite.conf
new file mode 100644
index 0000000..3cdc525
--- /dev/null
+++ b/suites/aoip_encryption/suite.conf
@@ -0,0 +1,10 @@
+resources:
+  ip_address:
+  - times: 5 # msc, bsc, hlr, stp, mgw
+  bts:
+  - times: 1
+  modem:
+  - times: 1
+
+defaults:
+  timeout: 120s