diff --git a/autotests/testEAP-AKA-prime/connection_test.py b/autotests/testEAP-AKA-prime/connection_test.py
deleted file mode 100644
index 8367022c..00000000
--- a/autotests/testEAP-AKA-prime/connection_test.py
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/python3
-
-import unittest
-import sys
-
-sys.path.append('../util')
-import iwd
-from iwd import IWD
-from iwd import NetworkType
-from hlrauc import AuthCenter
-
-class Test(unittest.TestCase):
-
-    def test_connection_success(self):
-        auth = AuthCenter('/tmp/hlrauc.sock', '/tmp/sim.db')
-
-        wd = IWD()
-
-        devices = wd.list_devices(1)
-        device = devices[0]
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        ordered_network = device.get_ordered_network('ssidEAP-AKA')
-
-        self.assertEqual(ordered_network.type, NetworkType.eap)
-
-        condition = 'not obj.connected'
-        wd.wait_for_object_condition(ordered_network.network_object, condition)
-
-        try:
-                ordered_network.network_object.connect()
-        except:
-                auth.stop()
-                raise
-
-        condition = 'obj.state == DeviceState.connected'
-        wd.wait_for_object_condition(device, condition)
-
-        device.disconnect()
-
-        condition = 'not obj.connected'
-        wd.wait_for_object_condition(ordered_network.network_object, condition)
-
-        auth.stop()
-    @classmethod
-    def setUpClass(cls):
-        IWD.copy_to_storage('ssidEAP-AKA.8021x')
-
-    @classmethod
-    def tearDownClass(cls):
-        IWD.clear_storage()
-
-if __name__ == '__main__':
-    unittest.main(exit=True)
diff --git a/autotests/testEAP-AKA-prime/hw.conf b/autotests/testEAP-AKA-prime/hw.conf
deleted file mode 100644
index 61dcc807..00000000
--- a/autotests/testEAP-AKA-prime/hw.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-[SETUP]
-num_radios=2
-max_test_exec_interval_sec=40
-tmpfs_extra_stuff=sim.eap_user:sim.db:sim_keys.conf
-sim_keys=/tmp/sim_keys.conf
-
-[HOSTAPD]
-rad0=ssidEAP-AKA.conf
diff --git a/autotests/testEAP-AKA-prime/sim.db b/autotests/testEAP-AKA-prime/sim.db
deleted file mode 100644
index 526e4bb1..00000000
--- a/autotests/testEAP-AKA-prime/sim.db
+++ /dev/null
@@ -1 +0,0 @@
-32010000000000:90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:61df:000000000021
\ No newline at end of file
diff --git a/autotests/testEAP-AKA-prime/sim.eap_user b/autotests/testEAP-AKA-prime/sim.eap_user
deleted file mode 100644
index 915c8fb0..00000000
--- a/autotests/testEAP-AKA-prime/sim.eap_user
+++ /dev/null
@@ -1 +0,0 @@
-"632010000000000@example.com"	AKA'
\ No newline at end of file
diff --git a/autotests/testEAP-AKA-prime/sim_keys.conf b/autotests/testEAP-AKA-prime/sim_keys.conf
deleted file mode 100644
index fe7a6399..00000000
--- a/autotests/testEAP-AKA-prime/sim_keys.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[AKA]
-Identity=32010000000000@example.com
-KI=90dca4eda45b53cf0f12d7c9c3bc6a89
-OPC=cb9cccc4b9258e6dca4760379fb82581
-AMF=61df
-SQN=000000000021
diff --git a/autotests/testEAP-AKA-prime/ssidEAP-AKA.8021x b/autotests/testEAP-AKA-prime/ssidEAP-AKA.8021x
deleted file mode 100644
index 6e88da6b..00000000
--- a/autotests/testEAP-AKA-prime/ssidEAP-AKA.8021x
+++ /dev/null
@@ -1,5 +0,0 @@
-[Security]
-EAP-Method=AKA'
-
-[Settings]
-AutoConnect=false
diff --git a/autotests/testEAP-AKA-prime/ssidEAP-AKA.conf b/autotests/testEAP-AKA-prime/ssidEAP-AKA.conf
deleted file mode 100644
index 01f01f45..00000000
--- a/autotests/testEAP-AKA-prime/ssidEAP-AKA.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-hw_mode=g
-channel=1
-
-driver=nl80211
-ieee8021x=1
-eap_server=1
-ssid=ssidEAP-AKA
-eap_user_file=/tmp/sim.eap_user
-eap_sim_db=unix:/tmp/hlrauc.sock
-wpa=2
-wpa_key_mgmt=WPA-EAP
-wpa_pairwise=TKIP CCMP
-rsn_pairwise=CCMP TKIP
-wpa_passphrase=secret123
-channel=1
-eap_sim_aka_result_ind=1
diff --git a/autotests/testEAP-AKA/connection_test.py b/autotests/testEAP-AKA/connection_test.py
deleted file mode 100644
index 122fd6b7..00000000
--- a/autotests/testEAP-AKA/connection_test.py
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/usr/bin/python3
-
-import unittest
-import sys
-
-sys.path.append('../util')
-import iwd
-from iwd import IWD
-from iwd import NetworkType
-from hlrauc import AuthCenter
-
-from hostapd import HostapdCLI
-
-class Test(unittest.TestCase):
-
-    def test_connection_success(self):
-        hostapd = HostapdCLI(config='ssidEAP-AKA.conf')
-
-        self.assertIsNotNone(hostapd)
-
-        auth = AuthCenter('/tmp/hlrauc.sock', '/tmp/sim.db')
-
-        wd = IWD()
-
-        devices = wd.list_devices(1)
-        device = devices[0]
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        ordered_network = device.get_ordered_network('ssidEAP-AKA')
-
-        self.assertEqual(ordered_network.type, NetworkType.eap)
-
-        condition = 'not obj.connected'
-        wd.wait_for_object_condition(ordered_network.network_object, condition)
-
-        try:
-                ordered_network.network_object.connect()
-        except:
-                auth.stop()
-                raise
-
-        condition = 'obj.state == DeviceState.connected'
-        wd.wait_for_object_condition(device, condition)
-
-        hostapd.eapol_reauth(device.address)
-
-        hostapd.wait_for_event('CTRL-EVENT-EAP-STARTED')
-        hostapd.wait_for_event('CTRL-EVENT-EAP-SUCCESS')
-
-        condition = 'obj.state == DeviceState.connected'
-        wd.wait_for_object_condition(device, condition)
-
-        device.disconnect()
-
-        condition = 'not obj.connected'
-        wd.wait_for_object_condition(ordered_network.network_object, condition)
-
-        auth.stop()
-    @classmethod
-    def setUpClass(cls):
-        IWD.copy_to_storage('ssidEAP-AKA.8021x')
-
-    @classmethod
-    def tearDownClass(cls):
-        IWD.clear_storage()
-
-if __name__ == '__main__':
-    unittest.main(exit=True)
diff --git a/autotests/testEAP-AKA/hw.conf b/autotests/testEAP-AKA/hw.conf
deleted file mode 100644
index 61dcc807..00000000
--- a/autotests/testEAP-AKA/hw.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-[SETUP]
-num_radios=2
-max_test_exec_interval_sec=40
-tmpfs_extra_stuff=sim.eap_user:sim.db:sim_keys.conf
-sim_keys=/tmp/sim_keys.conf
-
-[HOSTAPD]
-rad0=ssidEAP-AKA.conf
diff --git a/autotests/testEAP-AKA/sim.db b/autotests/testEAP-AKA/sim.db
deleted file mode 100644
index 526e4bb1..00000000
--- a/autotests/testEAP-AKA/sim.db
+++ /dev/null
@@ -1 +0,0 @@
-32010000000000:90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:61df:000000000021
\ No newline at end of file
diff --git a/autotests/testEAP-AKA/sim.eap_user b/autotests/testEAP-AKA/sim.eap_user
deleted file mode 100644
index ef82f9f1..00000000
--- a/autotests/testEAP-AKA/sim.eap_user
+++ /dev/null
@@ -1 +0,0 @@
-"032010000000000@example.com"	AKA
diff --git a/autotests/testEAP-AKA/sim_keys.conf b/autotests/testEAP-AKA/sim_keys.conf
deleted file mode 100644
index fe7a6399..00000000
--- a/autotests/testEAP-AKA/sim_keys.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[AKA]
-Identity=32010000000000@example.com
-KI=90dca4eda45b53cf0f12d7c9c3bc6a89
-OPC=cb9cccc4b9258e6dca4760379fb82581
-AMF=61df
-SQN=000000000021
diff --git a/autotests/testEAP-AKA/ssidEAP-AKA.8021x b/autotests/testEAP-AKA/ssidEAP-AKA.8021x
deleted file mode 100644
index 304eb276..00000000
--- a/autotests/testEAP-AKA/ssidEAP-AKA.8021x
+++ /dev/null
@@ -1,5 +0,0 @@
-[Security]
-EAP-Method=AKA
-
-[Settings]
-AutoConnect=false
diff --git a/autotests/testEAP-AKA/ssidEAP-AKA.conf b/autotests/testEAP-AKA/ssidEAP-AKA.conf
deleted file mode 100644
index 01f01f45..00000000
--- a/autotests/testEAP-AKA/ssidEAP-AKA.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-hw_mode=g
-channel=1
-
-driver=nl80211
-ieee8021x=1
-eap_server=1
-ssid=ssidEAP-AKA
-eap_user_file=/tmp/sim.eap_user
-eap_sim_db=unix:/tmp/hlrauc.sock
-wpa=2
-wpa_key_mgmt=WPA-EAP
-wpa_pairwise=TKIP CCMP
-rsn_pairwise=CCMP TKIP
-wpa_passphrase=secret123
-channel=1
-eap_sim_aka_result_ind=1
diff --git a/autotests/testEAP-SIM/connection_test.py b/autotests/testEAP-SIM/connection_test.py
deleted file mode 100644
index a7615b52..00000000
--- a/autotests/testEAP-SIM/connection_test.py
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/usr/bin/python3
-
-import unittest
-import sys
-
-sys.path.append('../util')
-import iwd
-from iwd import IWD
-from iwd import NetworkType
-from hlrauc import AuthCenter
-
-from hostapd import HostapdCLI
-
-class Test(unittest.TestCase):
-
-    def test_connection_success(self):
-        hostapd = HostapdCLI(config='ssidEAP-SIM.conf')
-
-        auth = AuthCenter('/tmp/hlrauc.sock', '/tmp/sim.db')
-
-        wd = IWD()
-
-        devices = wd.list_devices(1)
-        device = devices[0]
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        ordered_network = device.get_ordered_network('ssidEAP-SIM')
-
-        self.assertEqual(ordered_network.type, NetworkType.eap)
-
-        condition = 'not obj.connected'
-        wd.wait_for_object_condition(ordered_network.network_object, condition)
-
-        try:
-                ordered_network.network_object.connect()
-        except:
-                auth.stop()
-                raise
-
-        condition = 'obj.state == DeviceState.connected'
-        wd.wait_for_object_condition(device, condition)
-
-        hostapd.eapol_reauth(device.address)
-
-        hostapd.wait_for_event('CTRL-EVENT-EAP-STARTED')
-        hostapd.wait_for_event('CTRL-EVENT-EAP-SUCCESS')
-
-        condition = 'obj.state == DeviceState.connected'
-        wd.wait_for_object_condition(device, condition)
-
-        device.disconnect()
-
-        condition = 'not obj.connected'
-        wd.wait_for_object_condition(ordered_network.network_object, condition)
-
-        auth.stop()
-
-    @classmethod
-    def setUpClass(cls):
-        IWD.copy_to_storage('ssidEAP-SIM.8021x')
-
-    @classmethod
-    def tearDownClass(cls):
-        IWD.clear_storage()
-
-if __name__ == '__main__':
-    unittest.main(exit=True)
diff --git a/autotests/testEAP-SIM/hw.conf b/autotests/testEAP-SIM/hw.conf
deleted file mode 100644
index d725e38a..00000000
--- a/autotests/testEAP-SIM/hw.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-[SETUP]
-num_radios=2
-max_test_exec_interval_sec=40
-tmpfs_extra_stuff=sim.eap_user:sim.db:sim_keys.conf
-sim_keys=/tmp/sim_keys.conf
-
-[HOSTAPD]
-rad0=ssidEAP-SIM.conf
diff --git a/autotests/testEAP-SIM/sim.db b/autotests/testEAP-SIM/sim.db
deleted file mode 100644
index 04f0ac8e..00000000
--- a/autotests/testEAP-SIM/sim.db
+++ /dev/null
@@ -1 +0,0 @@
-32010000000000:D0D1D2D3D4D5D6D7:E1E2E3E4:DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD
\ No newline at end of file
diff --git a/autotests/testEAP-SIM/sim.eap_user b/autotests/testEAP-SIM/sim.eap_user
deleted file mode 100644
index 17f7e1ae..00000000
--- a/autotests/testEAP-SIM/sim.eap_user
+++ /dev/null
@@ -1 +0,0 @@
-"132010000000000@example.com"	SIM
diff --git a/autotests/testEAP-SIM/sim_keys.conf b/autotests/testEAP-SIM/sim_keys.conf
deleted file mode 100644
index 000760ad..00000000
--- a/autotests/testEAP-SIM/sim_keys.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[SIM]
-Identity=32010000000000@example.com
-Kc=d0d1d2d3d4d5d6d7d0d1d2d3d4d5d6d7d0d1d2d3d4d5d6d7
-SRES=e1e2e3e4e1e2e3e4e1e2e3e4
diff --git a/autotests/testEAP-SIM/ssidEAP-SIM.8021x b/autotests/testEAP-SIM/ssidEAP-SIM.8021x
deleted file mode 100644
index 1dcdbcb6..00000000
--- a/autotests/testEAP-SIM/ssidEAP-SIM.8021x
+++ /dev/null
@@ -1,5 +0,0 @@
-[Security]
-EAP-Method=SIM
-
-[Settings]
-AutoConnect=false
diff --git a/autotests/testEAP-SIM/ssidEAP-SIM.conf b/autotests/testEAP-SIM/ssidEAP-SIM.conf
deleted file mode 100644
index 6071e301..00000000
--- a/autotests/testEAP-SIM/ssidEAP-SIM.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-hw_mode=g
-channel=1
-
-driver=nl80211
-ieee8021x=1
-eap_server=1
-ssid=ssidEAP-SIM
-eap_user_file=/tmp/sim.eap_user
-eap_sim_db=unix:/tmp/hlrauc.sock
-wpa=2
-wpa_key_mgmt=WPA-EAP
-wpa_pairwise=TKIP CCMP
-rsn_pairwise=CCMP TKIP
-wpa_passphrase=secret123
-channel=1
-eap_sim_aka_result_ind=1