diff --git a/tests/hwsim/hostapd.py b/tests/hwsim/hostapd.py
index 12e4a9f86..ada6d6dcb 100644
--- a/tests/hwsim/hostapd.py
+++ b/tests/hwsim/hostapd.py
@@ -179,7 +179,7 @@ class Hostapd:
         hdr = struct.pack('<HH6B6B6BH', *t)
         self.request("MGMT_TX " + binascii.hexlify(hdr + msg['payload']))
 
-def add_ap(ifname, params):
+def add_ap(ifname, params, wait_enabled=True):
         logger.info("Starting AP " + ifname)
         hapd_global = HostapdGlobal()
         hapd_global.remove(ifname)
@@ -203,6 +203,10 @@ def add_ap(ifname, params):
             else:
                 hapd.set(f, v)
         hapd.enable()
+        if wait_enabled:
+            ev = hapd.wait_event(["AP-ENABLED"], timeout=30)
+            if ev is None:
+                raise Exception("AP startup timed out")
         return hapd
 
 def add_bss(phy, ifname, confname, ignore_error=False):
diff --git a/tests/hwsim/test_ap_acs.py b/tests/hwsim/test_ap_acs.py
index d456b8106..cfa45abbb 100644
--- a/tests/hwsim/test_ap_acs.py
+++ b/tests/hwsim/test_ap_acs.py
@@ -42,7 +42,7 @@ def test_ap_acs(dev, apdev):
     """Automatic channel selection"""
     params = hostapd.wpa2_params(ssid="test-acs", passphrase="12345678")
     params['channel'] = '0'
-    hapd = hostapd.add_ap(apdev[0]['ifname'], params)
+    hapd = hostapd.add_ap(apdev[0]['ifname'], params, wait_enabled=False)
     wait_acs(hapd)
 
     freq = hapd.get_status_field("freq")
diff --git a/tests/hwsim/test_ap_ht.py b/tests/hwsim/test_ap_ht.py
index 5ab6fe9ee..d0ee300a9 100644
--- a/tests/hwsim/test_ap_ht.py
+++ b/tests/hwsim/test_ap_ht.py
@@ -17,11 +17,11 @@ def test_ap_ht40_scan(dev, apdev):
     params = { "ssid": "test-ht40",
                "channel": "5",
                "ht_capab": "[HT40-]"}
-    hapd = hostapd.add_ap(apdev[0]['ifname'], params)
+    hapd = hostapd.add_ap(apdev[0]['ifname'], params, wait_enabled=False)
 
     state = hapd.get_status_field("state")
     if state != "HT_SCAN":
-        time.wait(0.1)
+        time.sleep(0.1)
         state = hapd.get_status_field("state")
         if state != "HT_SCAN":
             raise Exception("Unexpected interface state - expected HT_SCAN")