diff --git a/tests/hwsim/test_gas.py b/tests/hwsim/test_gas.py
index b04277353..6f5bf49a1 100644
--- a/tests/hwsim/test_gas.py
+++ b/tests/hwsim/test_gas.py
@@ -189,7 +189,23 @@ def test_gas_fragment(dev, apdev):
     hapd = hostapd.Hostapd(apdev[0]['ifname'])
     hapd.set("gas_frag_limit", "50")
 
-    dev[0].scan()
+    dev[0].scan(freq="2412")
+    dev[0].request("FETCH_ANQP")
+    for i in range(0, 6):
+        ev = dev[0].wait_event(["RX-ANQP"], timeout=5)
+        if ev is None:
+            raise Exception("Operation timed out")
+
+def test_gas_comeback_delay(dev, apdev):
+    """GAS fragmentation"""
+    bssid = apdev[0]['bssid']
+    params = hs20_ap_params()
+    params['hessid'] = bssid
+    hostapd.add_ap(apdev[0]['ifname'], params)
+    hapd = hostapd.Hostapd(apdev[0]['ifname'])
+    hapd.set("gas_comeback_delay", "500")
+
+    dev[0].scan(freq="2412")
     dev[0].request("FETCH_ANQP")
     for i in range(0, 6):
         ev = dev[0].wait_event(["RX-ANQP"], timeout=5)