diff --git a/tests/hwsim/p2p_utils.py b/tests/hwsim/p2p_utils.py
index fe115e0ab..c0db35a86 100644
--- a/tests/hwsim/p2p_utils.py
+++ b/tests/hwsim/p2p_utils.py
@@ -351,6 +351,7 @@ def go_neg_pbc(i_dev, r_dev, i_intent=None, r_intent=None, i_freq=None,
     logger.debug("Wait for GO Negotiation Request on r_dev")
     ev = r_dev.wait_global_event(["P2P-GO-NEG-REQUEST"], timeout=timeout - 5)
     if ev is None:
+        logger.debug("Wait for P2P-GO-NEG-REQUEST timed out on r_dev - wait for i_dev thread to complete")
         t.join()
         raise Exception("GO Negotiation timed out")
     r_dev.dump_monitor()
diff --git a/tests/hwsim/test_p2p_concurrency.py b/tests/hwsim/test_p2p_concurrency.py
index 8fb2bb929..a7287679c 100644
--- a/tests/hwsim/test_p2p_concurrency.py
+++ b/tests/hwsim/test_p2p_concurrency.py
@@ -221,7 +221,8 @@ def test_concurrent_grpform_while_connecting2(dev, apdev):
     dev[0].global_request("SET p2p_no_group_iface 0")
 
     [i_res, r_res] = go_neg_pbc(i_dev=dev[0], i_intent=15, i_freq=2412,
-                                r_dev=dev[1], r_intent=0, r_freq=2412)
+                                r_dev=dev[1], r_intent=0, r_freq=2412,
+                                timeout=30)
     check_grpform_results(i_res, r_res)
     remove_group(dev[0], dev[1])
 
@@ -240,7 +241,8 @@ def test_concurrent_grpform_while_connecting3(dev, apdev):
     dev[0].global_request("SET p2p_no_group_iface 0")
 
     [i_res, r_res] = go_neg_pbc(i_dev=dev[1], i_intent=15, i_freq=2412,
-                                r_dev=dev[0], r_intent=0, r_freq=2412)
+                                r_dev=dev[0], r_intent=0, r_freq=2412,
+                                timeout=30)
     check_grpform_results(i_res, r_res)
     remove_group(dev[0], dev[1])