diff --git a/autotests/testEAP-TTLS-MSCHAPv2/connection_test.py b/autotests/testEAP-TTLS-MSCHAPv2/connection_test.py
index fb073dc9..66cc440b 100644
--- a/autotests/testEAP-TTLS-MSCHAPv2/connection_test.py
+++ b/autotests/testEAP-TTLS-MSCHAPv2/connection_test.py
@@ -11,18 +11,11 @@ from iwd import PSKAgent
 from iwd import NetworkType
 
 from hostapd import HostapdCLI
-from hostapd import hostapd_map
 
 class Test(unittest.TestCase):
 
     def validate_connection(self, wd):
-        hostapd = None
-
-        for hostapd_if in list(hostapd_map.values()):
-            hpd = HostapdCLI(hostapd_if)
-            if hpd.get_config_value('ssid') == 'ssidEAP-TTLS-MSCHAPv2':
-                hostapd = hpd
-                break
+        hostapd = HostapdCLI(config='ssidEAP-TTLS-MSCHAPv2.conf')
 
         self.assertIsNotNone(hostapd)
 
diff --git a/autotests/testEAP-TTLS-MSCHAPv2/failure_test.py b/autotests/testEAP-TTLS-MSCHAPv2/failure_test.py
index c91ce3c9..b4c3c003 100644
--- a/autotests/testEAP-TTLS-MSCHAPv2/failure_test.py
+++ b/autotests/testEAP-TTLS-MSCHAPv2/failure_test.py
@@ -11,18 +11,11 @@ from iwd import PSKAgent
 from iwd import NetworkType
 
 from hostapd import HostapdCLI
-from hostapd import hostapd_map
 
 class Test(unittest.TestCase):
 
     def validate_connection(self, wd):
-        hostapd = None
-
-        for hostapd_if in list(hostapd_map.values()):
-            hpd = HostapdCLI(hostapd_if)
-            if hpd.get_config_value('ssid') == 'ssidEAP-TTLS-MSCHAPv2':
-                hostapd = hpd
-                break
+        hostapd = HostapdCLI(config='ssidEAP-TTLS-MSCHAPv2.conf')
 
         self.assertIsNotNone(hostapd)