diff --git a/autotests/testHotspot/hessid.conf b/autotests/testHotspot/hessid.conf
new file mode 100644
index 00000000..7f2de240
--- /dev/null
+++ b/autotests/testHotspot/hessid.conf
@@ -0,0 +1,10 @@
+[Security]
+EAP-Method=TTLS
+EAP-Identity=anonymous@example.com
+EAP-TTLS-Phase2-Method=Tunneled-MSCHAPv2
+
+[Hotspot]
+HESSID=02:00:00:00:04:00
+
+[Settings]
+Autoconnect=False
diff --git a/autotests/testHotspot/hessid_test.py b/autotests/testHotspot/hessid_test.py
new file mode 100644
index 00000000..ccfbbd83
--- /dev/null
+++ b/autotests/testHotspot/hessid_test.py
@@ -0,0 +1,69 @@
+#!/usr/bin/python3
+
+import unittest
+import sys
+import os
+
+sys.path.append('../util')
+import iwd
+from iwd import IWD
+from iwd import PSKAgent
+from iwd import NetworkType
+from hostapd import HostapdCLI
+import testutil
+
+class Test(unittest.TestCase):
+
+    def test_connection_success(self):
+        wd = IWD(True, '/tmp')
+
+        hapd = HostapdCLI(config='ssidHotspot.conf')
+
+        psk_agent = PSKAgent('abc', ('domain\\user', 'testpasswd'))
+        wd.register_psk_agent(psk_agent)
+
+        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('Hotspot')
+
+        self.assertEqual(ordered_network.type, NetworkType.eap)
+
+        condition = 'not obj.connected'
+        wd.wait_for_object_condition(ordered_network.network_object, condition)
+
+        ordered_network.network_object.connect()
+
+        condition = 'obj.connected'
+        wd.wait_for_object_condition(ordered_network.network_object, condition)
+
+        testutil.test_iface_operstate()
+        testutil.test_ifaces_connected(device.name, hapd.ifname)
+
+        device.disconnect()
+
+        condition = 'not obj.connected'
+        wd.wait_for_object_condition(ordered_network.network_object, condition)
+
+        wd.unregister_psk_agent(psk_agent)
+
+    @classmethod
+    def setUpClass(cls):
+        IWD.copy_to_hotspot('hessid.conf')
+        conf = '[General]\ndisable_anqp=1\n'
+        os.system('echo "%s" > /tmp/main.conf' % conf)
+
+    @classmethod
+    def tearDownClass(cls):
+        IWD.clear_storage()
+
+if __name__ == '__main__':
+    unittest.main(exit=True)
diff --git a/autotests/testHotspot/hotspot_test.py b/autotests/testHotspot/hotspot_test.py
index c5f8f8f5..2d7de132 100644
--- a/autotests/testHotspot/hotspot_test.py
+++ b/autotests/testHotspot/hotspot_test.py
@@ -2,6 +2,7 @@
 
 import unittest
 import sys
+import os
 
 sys.path.append('../util')
 import iwd
@@ -14,7 +15,7 @@ import testutil
 class Test(unittest.TestCase):
 
     def test_connection_success(self):
-        wd = IWD()
+        wd = IWD(True, '/tmp')
 
         hapd = HostapdCLI(config='ssidHotspot.conf')
 
@@ -57,6 +58,8 @@ class Test(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         IWD.copy_to_hotspot('example.conf')
+        conf = '[General]\ndisable_anqp=0\n'
+        os.system('echo "%s" > /tmp/main.conf' % conf)
 
     @classmethod
     def tearDownClass(cls):
diff --git a/autotests/testHotspot/hw.conf b/autotests/testHotspot/hw.conf
index d68793b9..f228a9a1 100644
--- a/autotests/testHotspot/hw.conf
+++ b/autotests/testHotspot/hw.conf
@@ -1,8 +1,8 @@
 [SETUP]
 num_radios=2
-tmpfs_extra_stuff=../misc/certs:eap_users.text:main.conf:example.conf:hessid.conf
+tmpfs_extra_stuff=../misc/certs:eap_users.text:example.conf:hessid.conf
 max_test_exec_interval_sec=60
-iwd_config_dir=/tmp
+start_iwd=0
 
 [HOSTAPD]
 rad0=ssidHotspot.conf
diff --git a/autotests/testHotspot/main.conf b/autotests/testHotspot/main.conf
deleted file mode 100644
index a8eebd75..00000000
--- a/autotests/testHotspot/main.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[General]
-disable_anqp=0
diff --git a/autotests/testHotspot/ssidHotspot.conf b/autotests/testHotspot/ssidHotspot.conf
index 77804d9e..e76b6041 100644
--- a/autotests/testHotspot/ssidHotspot.conf
+++ b/autotests/testHotspot/ssidHotspot.conf
@@ -6,7 +6,7 @@ rsn_pairwise=CCMP
 wpa_key_mgmt=WPA-EAP
 ieee80211w=1
 ieee8021x=1
-hessid=02:00:00:00:01:00
+hessid=02:00:00:00:04:00
 interworking=1
 access_network_type=14
 internet=1