diff --git a/tests/hwsim/test_scan.py b/tests/hwsim/test_scan.py
index 5beec4f32..15acfe3ca 100644
--- a/tests/hwsim/test_scan.py
+++ b/tests/hwsim/test_scan.py
@@ -1031,7 +1031,7 @@ def _test_scan_dfs(dev, apdev, params):
 
     if "OK" not in dev[0].request("SCAN"):
         raise Exception("SCAN command failed")
-    ev = dev[0].wait_event(["CTRL-EVENT-SCAN-RESULTS"])
+    ev = dev[0].wait_event(["CTRL-EVENT-SCAN-RESULTS"], timeout=15)
     if ev is None:
         raise Exception("Scan did not complete")
 
diff --git a/tests/hwsim/wpasupplicant.py b/tests/hwsim/wpasupplicant.py
index a1f63c36e..fe1892785 100644
--- a/tests/hwsim/wpasupplicant.py
+++ b/tests/hwsim/wpasupplicant.py
@@ -1142,7 +1142,7 @@ class WpaSupplicant:
             if "eap" in kwargs:
                 self.connect_network(id, timeout=20)
             else:
-                self.connect_network(id)
+                self.connect_network(id, timeout=15)
         else:
             self.dump_monitor()
             self.select_network(id)