diff --git a/autotests/testChannelSwitch/connection_test.py b/autotests/testChannelSwitch/connection_test.py
index e5421c69..03d24a77 100644
--- a/autotests/testChannelSwitch/connection_test.py
+++ b/autotests/testChannelSwitch/connection_test.py
@@ -39,6 +39,10 @@ class Test(unittest.TestCase):
         testutil.test_ifaces_connected()
 
         hapd.chan_switch(2)
+        # Make sure the SA Query is verified and IWD doesn't disconnect
+        with self.assertRaises(TimeoutError):
+            condition = 'obj.state == DeviceState.disconnected'
+            wd.wait_for_object_condition(device, condition, 4)
 
         condition = 'obj.state == DeviceState.connected'
         wd.wait_for_object_condition(device, condition)
diff --git a/autotests/testChannelSwitch/ssidCCMP.conf b/autotests/testChannelSwitch/ssidCCMP.conf
index 074e8228..438b9955 100644
--- a/autotests/testChannelSwitch/ssidCCMP.conf
+++ b/autotests/testChannelSwitch/ssidCCMP.conf
@@ -5,3 +5,4 @@ ssid=ssidCCMP
 wpa=2
 wpa_pairwise=CCMP
 wpa_passphrase=secret123
+ocv=1