diff --git a/tests/hwsim/test_p2p_channel.py b/tests/hwsim/test_p2p_channel.py
index 5e9fee17f..bab3cc521 100644
--- a/tests/hwsim/test_p2p_channel.py
+++ b/tests/hwsim/test_p2p_channel.py
@@ -759,24 +759,32 @@ def test_p2p_go_move_reg_change(dev, apdev):
     """P2P GO move due to regulatory change"""
     try:
         set_country("US")
-        dev[0].global_request("P2P_SET disallow_freq 2400-5000")
+        dev[0].global_request("P2P_SET disallow_freq 2400-5000,5700-6000")
         res = autogo(dev[0])
         freq1 = int(res['freq'])
         if freq1 < 5000:
             raise Exception("Unexpected channel %d MHz" % freq1)
+        dev[0].dump_monitor()
 
         dev[0].global_request("P2P_SET disallow_freq ")
 
         # GO move is not allowed while waiting for initial client connection
         connect_cli(dev[0], dev[1], freq=freq1)
         dev[1].remove_group()
+        ev = dev[1].wait_global_event(["P2P-GROUP-REMOVED"], timeout=5)
+        if ev is None:
+            raise Exception("P2P-GROUP-REMOVED not reported on client")
+        dev[1].dump_monitor()
+        dev[0].dump_monitor()
 
         freq = dev[0].get_group_status_field('freq')
         if int(freq) < 5000:
             raise Exception("Unexpected freq after initial client: " + freq)
         dev[0].dump_monitor()
 
-        set_country("00")
+        dev[0].request("NOTE Setting country=BD")
+        set_country("BD")
+        dev[0].request("NOTE Waiting for GO channel change")
         ev = dev[0].wait_group_event(["P2P-REMOVE-AND-REFORM-GROUP",
                                       "AP-CSA-FINISHED"],
                                      timeout=10)