diff --git a/tests/hwsim/test_p2p_discovery.py b/tests/hwsim/test_p2p_discovery.py
index 23b18d23c..8931421c3 100644
--- a/tests/hwsim/test_p2p_discovery.py
+++ b/tests/hwsim/test_p2p_discovery.py
@@ -319,8 +319,7 @@ def test_discovery_social_plus_one(dev):
     if dev[1].peer_known(go):
         raise Exception("GO found in social-only scan")
 
-def test_discovery_and_interface_disabled(dev):
-    """P2P device discovery with interface getting didabled"""
+def _test_discovery_and_interface_disabled(dev, delay=1):
     try:
         if "OK" not in dev[0].p2p_find():
             raise Exception("Failed to start P2P find")
@@ -328,7 +327,7 @@ def test_discovery_and_interface_disabled(dev):
         if ev is None:
             raise Exception("Scan did not start")
         dev[0].request("DRIVER_EVENT INTERFACE_DISABLED")
-        time.sleep(1)
+        time.sleep(delay)
 
         # verify that P2P_FIND is rejected
         if "FAIL" not in dev[0].p2p_find():
@@ -347,6 +346,11 @@ def test_discovery_and_interface_disabled(dev):
     finally:
         dev[0].request("DRIVER_EVENT INTERFACE_ENABLED")
 
+def test_discovery_and_interface_disabled(dev):
+    """P2P device discovery with interface getting disabled"""
+    _test_discovery_and_interface_disabled(dev, delay=1)
+    _test_discovery_and_interface_disabled(dev, delay=5)
+
 def test_discovery_auto(dev):
     """P2P device discovery and provision discovery with auto GO/dev selection"""
     dev[0].flush_scan_cache()