diff --git a/tests/hwsim/test_gas.py b/tests/hwsim/test_gas.py
index 99a511fc0..a6379836f 100644
--- a/tests/hwsim/test_gas.py
+++ b/tests/hwsim/test_gas.py
@@ -15,6 +15,7 @@ import struct
 import hostapd
 from wpasupplicant import WpaSupplicant
 from utils import alloc_fail, skip_with_fips
+from hwsim import HWSimRadio
 
 def hs20_ap_params():
     params = hostapd.wpa2_params(ssid="test-gas")
@@ -241,7 +242,7 @@ def test_gas_fragment(dev, apdev):
 
     dev[0].scan_for_bss(apdev[0]['bssid'], freq="2412", force_scan=True)
     dev[0].request("FETCH_ANQP")
-    ev = dev[0].wait_event(["GAS-QUERY-DONE"], timeout=1)
+    ev = dev[0].wait_event(["GAS-QUERY-DONE"], timeout=5)
     if ev is None:
         raise Exception("No GAS-QUERY-DONE event")
     if "result=SUCCESS" not in ev:
@@ -256,6 +257,14 @@ def test_gas_fragment(dev, apdev):
     if "result=SUCCESS" not in ev:
         raise Exception("Unexpected ANQP result: " + ev)
 
+def test_gas_fragment_mcc(dev, apdev):
+    """GAS fragmentation with mac80211_hwsim MCC enabled"""
+    with HWSimRadio(n_channels=2) as (radio, iface):
+        wpas = WpaSupplicant(global_iface='/tmp/wpas-wlan5')
+        wpas.interface_add(iface)
+        ndev = [ wpas ]
+        test_gas_fragment(ndev, apdev)
+
 def test_gas_comeback_delay(dev, apdev):
     """GAS comeback delay"""
     hapd = start_ap(apdev[0])