diff --git a/tests/hwsim/test_ap_ht.py b/tests/hwsim/test_ap_ht.py
index 7fcbc547d..310001f00 100644
--- a/tests/hwsim/test_ap_ht.py
+++ b/tests/hwsim/test_ap_ht.py
@@ -620,11 +620,7 @@ def test_ap_ht40_csa(dev, apdev):
             raise Exception("Unexpected channel in CSA finished event")
         ev = dev[0].wait_event(["CTRL-EVENT-DISCONNECTED"], timeout=0.5)
         if ev is not None:
-            # This looks like a mac80211/cfg80211 bug - don't record FAIL until
-            # that gets fixed.
-            #raise Exception("Unexpected STA disconnection during CSA")
-            logger.info("Unexpected STA disconnection during CSA")
-            dev[0].wait_event(["CTRL-EVENT-CONNECTED"], timeout=5)
+            raise Exception("Unexpected STA disconnection during CSA")
         hwsim_utils.test_connectivity(dev[0], hapd)
 
         hapd.request("CHAN_SWITCH 5 5180 ht sec_channel_offset=1 bandwidth=40")
@@ -635,11 +631,7 @@ def test_ap_ht40_csa(dev, apdev):
             raise Exception("Unexpected channel in CSA finished event")
         ev = dev[0].wait_event(["CTRL-EVENT-DISCONNECTED"], timeout=0.5)
         if ev is not None:
-            # This looks like a mac80211/cfg80211 bug - don't record FAIL until
-            # that gets fixed.
-            #raise Exception("Unexpected STA disconnection during CSA")
-            logger.info("Unexpected STA disconnection during CSA")
-            dev[0].wait_event(["CTRL-EVENT-CONNECTED"], timeout=5)
+            raise Exception("Unexpected STA disconnection during CSA")
         hwsim_utils.test_connectivity(dev[0], hapd)
     finally:
         subprocess.call(['sudo', 'iw', 'reg', 'set', '00'])
@@ -708,11 +700,7 @@ def test_ap_ht40_csa3(dev, apdev):
             raise Exception("Unexpected channel in CSA finished event")
         ev = dev[0].wait_event(["CTRL-EVENT-DISCONNECTED"], timeout=0.5)
         if ev is not None:
-            # This looks like a mac80211/cfg80211 bug - don't record FAIL until
-            # that gets fixed.
-            #raise Exception("Unexpected STA disconnection during CSA")
-            logger.info("Unexpected STA disconnection during CSA")
-            dev[0].wait_event(["CTRL-EVENT-CONNECTED"], timeout=5)
+            raise Exception("Unexpected STA disconnection during CSA")
         hwsim_utils.test_connectivity(dev[0], hapd)
 
         hapd.request("CHAN_SWITCH 5 5180 ht sec_channel_offset=1 bandwidth=40")
@@ -723,11 +711,7 @@ def test_ap_ht40_csa3(dev, apdev):
             raise Exception("Unexpected channel in CSA finished event")
         ev = dev[0].wait_event(["CTRL-EVENT-DISCONNECTED"], timeout=0.5)
         if ev is not None:
-            # This looks like a mac80211/cfg80211 bug - don't record FAIL until
-            # that gets fixed.
-            #raise Exception("Unexpected STA disconnection during CSA")
-            logger.info("Unexpected STA disconnection during CSA")
-            dev[0].wait_event(["CTRL-EVENT-CONNECTED"], timeout=5)
+            raise Exception("Unexpected STA disconnection during CSA")
         hwsim_utils.test_connectivity(dev[0], hapd)
     finally:
         subprocess.call(['sudo', 'iw', 'reg', 'set', '00'])