diff --git a/tests/hwsim/test_p2p_autogo.py b/tests/hwsim/test_p2p_autogo.py
index 5453894d7..0801172e3 100644
--- a/tests/hwsim/test_p2p_autogo.py
+++ b/tests/hwsim/test_p2p_autogo.py
@@ -336,9 +336,11 @@ def test_autogo_legacy(dev):
     logger.info("Connect legacy non-WPS client")
     dev[2].request("FLUSH")
     dev[2].request("P2P_SET disabled 1")
+    dev[0].dump_monitor()
     dev[2].connect(ssid=res['ssid'], psk=res['passphrase'], proto='RSN',
                    key_mgmt='WPA-PSK', pairwise='CCMP', group='CCMP',
                    scan_freq=res['freq'])
+    dev[0].wait_event(["EAPOL-4WAY-HS-COMPLETED"])
     hwsim_utils.test_connectivity_p2p_sta(dev[1], dev[2])
     dev[2].request("DISCONNECT")