diff --git a/autotests/testAP/TestAP1.psk b/autotests/testAP/TestAP1.psk
new file mode 100644
index 00000000..bfb2f74b
--- /dev/null
+++ b/autotests/testAP/TestAP1.psk
@@ -0,0 +1,2 @@
+[Settings]
+Autoconnect=False
diff --git a/autotests/testAP/failure_test.py b/autotests/testAP/failure_test.py
index 35d4421e..ca28e5f1 100644
--- a/autotests/testAP/failure_test.py
+++ b/autotests/testAP/failure_test.py
@@ -57,9 +57,6 @@ class Test(unittest.TestCase):
         testutil.test_ifaces_connected(list(hostapd.hostapd_map.keys())[0],
                                        dev.name)
 
-        self.assertRaises(iwd.dbus.DBusException, dev.start_ap,
-                          'TestAP2', 'Password2')
-
         dev.disconnect()
 
         condition = 'not obj.connected'
@@ -106,7 +103,7 @@ class Test(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        pass
+        IWD.copy_to_storage('TestAP1.psk')
 
     @classmethod
     def tearDownClass(cls):
diff --git a/autotests/testAP/test.py b/autotests/testAP/test.py
index 1b6b1580..6c4ffce2 100644
--- a/autotests/testAP/test.py
+++ b/autotests/testAP/test.py
@@ -50,9 +50,6 @@ class Test(unittest.TestCase):
         testutil.test_ifaces_connected(list(hostapd.hostapd_map.keys())[0],
                                        dev.name)
 
-        self.assertRaises(iwd.dbus.DBusException, dev.start_ap,
-                          'TestAP2', 'Password2')
-
         dev.disconnect()
 
         condition = 'not obj.connected'
@@ -118,7 +115,7 @@ class Test(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        pass
+        IWD.copy_to_storage('TestAP1.psk')
 
     @classmethod
     def tearDownClass(cls):