diff --git a/.gitlab/tests/cram/wnc-freedom/106-pwhm-get-eht-caps_step_1.t b/.gitlab/tests/cram/wnc-freedom/106-pwhm-get-eht-caps_step_1.t
index 8b4b7b1dd5..5d9ae0cc69 100644
--- a/.gitlab/tests/cram/wnc-freedom/106-pwhm-get-eht-caps_step_1.t
+++ b/.gitlab/tests/cram/wnc-freedom/106-pwhm-get-eht-caps_step_1.t
@@ -136,6 +136,28 @@ Check that get_eht_ops output is empty:
 
   $ get_eht_ops 2.4
 
+Check that all radios and private vaps are still up:
+
+  $ sleep 5
+
+  $ wifi_dm_radio_band 2 "Status?"
+  Device.WiFi.Radio.\d+.Status="Up" (re)
+
+  $ wifi_dm_radio_band 5 "Status?"
+  Device.WiFi.Radio.\d+.Status="Up" (re)
+
+  $ wifi_dm_radio_band 6 "Status?"
+  Device.WiFi.Radio.\d+.Status="Up" (re)
+
+  $ wifi_dm "AccessPoint.1.Status?0"
+  Device.WiFi.AccessPoint.1.Status="Enabled"
+
+  $ wifi_dm "AccessPoint.3.Status?0"
+  Device.WiFi.AccessPoint.3.Status="Enabled"
+
+  $ wifi_dm "AccessPoint.5.Status?0"
+  Device.WiFi.AccessPoint.5.Status="Enabled"
+
 #########################################
 #    test 5GHz getEHTOperations         #
 #########################################
@@ -225,13 +247,24 @@ Check if channels 40 is still configured in Radio.StaticPuncturing
   $ wifi_dm_radio_band 5 "StaticPuncturing.DisabledSubChannels?" "WiFi." "ba-cli"
   WiFi.Radio.\d+.StaticPuncturing.DisabledSubChannels="40" (re)
 
-#########################################
-#    test 6GHz getEHTOperations         #
-#########################################
+Check that all radios and private vaps are still up:
 
-  $ R logger -t cram "Test getEHTOperations on 6GHz"
+  $ sleep 5
 
-Check ChannelsInUse:
+  $ wifi_dm_radio_band 2 "Status?"
+  Device.WiFi.Radio.\d+.Status="Up" (re)
 
-  $ wifi_dm_radio_band 6 "ChannelsInUse?"
-  Device.WiFi.Radio.\d+.ChannelsInUse="33,37,41,45,49,53,57,61" (re)
+  $ wifi_dm_radio_band 5 "Status?"
+  Device.WiFi.Radio.\d+.Status="Up" (re)
+
+  $ wifi_dm_radio_band 6 "Status?"
+  Device.WiFi.Radio.\d+.Status="Up" (re)
+
+  $ wifi_dm "AccessPoint.1.Status?0"
+  Device.WiFi.AccessPoint.1.Status="Enabled"
+
+  $ wifi_dm "AccessPoint.3.Status?0"
+  Device.WiFi.AccessPoint.3.Status="Enabled"
+
+  $ wifi_dm "AccessPoint.5.Status?0"
+  Device.WiFi.AccessPoint.5.Status="Enabled"
diff --git a/.gitlab/tests/cram/wnc-freedom/106-pwhm-get-eht-caps_step_2.t b/.gitlab/tests/cram/wnc-freedom/106-pwhm-get-eht-caps_step_2.t
index 156307fe25..d67e281c35 100644
--- a/.gitlab/tests/cram/wnc-freedom/106-pwhm-get-eht-caps_step_2.t
+++ b/.gitlab/tests/cram/wnc-freedom/106-pwhm-get-eht-caps_step_2.t
@@ -5,6 +5,17 @@ Create R alias:
 
   $ R "logger -t cram 'Starting EHT Operations test (step 2) ...'"
 
+#########################################
+#    test 6GHz getEHTOperations         #
+#########################################
+
+  $ R logger -t cram "Test getEHTOperations on 6GHz"
+
+Check ChannelsInUse:
+
+  $ wifi_dm_radio_band 6 "ChannelsInUse?"
+  Device.WiFi.Radio.\d+.ChannelsInUse="33,37,41,45,49,53,57,61" (re)
+
 Check EhtPhyCapabilities, EhtPhyCapabilitiesStr, CurrentEhtOperatingIE and getEHTOperations():
 
   $ R logger -t cram "Check EHT Capabilities"
@@ -83,6 +94,28 @@ Check channels 49,53 are still configured in Radio.StaticPuncturing
   $ wifi_dm_radio_band 6 "StaticPuncturing.DisabledSubChannels?"
   Device.WiFi.Radio.\d+.StaticPuncturing.DisabledSubChannels="49,53" (re)
 
+Check that all radios and private vaps are still up:
+
+  $ sleep 5
+
+  $ wifi_dm_radio_band 2 "Status?"
+  Device.WiFi.Radio.\d+.Status="Up" (re)
+
+  $ wifi_dm_radio_band 5 "Status?"
+  Device.WiFi.Radio.\d+.Status="Up" (re)
+
+  $ wifi_dm_radio_band 6 "Status?"
+  Device.WiFi.Radio.\d+.Status="Up" (re)
+
+  $ wifi_dm "AccessPoint.1.Status?0"
+  Device.WiFi.AccessPoint.1.Status="Enabled"
+
+  $ wifi_dm "AccessPoint.3.Status?0"
+  Device.WiFi.AccessPoint.3.Status="Enabled"
+
+  $ wifi_dm "AccessPoint.5.Status?0"
+  Device.WiFi.AccessPoint.5.Status="Enabled"
+
 #########################################
 #    Restore defaults                   #
 #########################################