diff --git a/.zuul.yaml b/.zuul.yaml
index bd72ab28..6e50b40e 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -75,7 +75,6 @@
             compute-feature-enabled:
               volume_backed_live_migration: true
               stable_compute_uuid_supported: true
-              cpu_power_management: true
             auth:
               tempest_roles: creator
         post-config:
@@ -90,7 +89,6 @@
               cpu_mode: custom
               cpu_models: Nehalem
               cpu_model_extra_flags: vme,+ssse3,-mmx
-              cpu_power_management: True
               virt_type: kvm
               rx_queue_size: 1024
               swtpm_enabled: True
@@ -118,7 +116,6 @@
                 cpu_mode: custom
                 cpu_models: Nehalem
                 cpu_model_extra_flags: vme,+ssse3,-mmx
-                cpu_power_management: True
                 virt_type: kvm
                 rx_queue_size: 1024
                 swtpm_enabled: True
diff --git a/whitebox_tempest_plugin/api/compute/test_cpu_state_mgmt.py b/whitebox_tempest_plugin/api/compute/test_cpu_state_mgmt.py
index 846e78db..2feede69 100644
--- a/whitebox_tempest_plugin/api/compute/test_cpu_state_mgmt.py
+++ b/whitebox_tempest_plugin/api/compute/test_cpu_state_mgmt.py
@@ -14,11 +14,16 @@
 #    under the License.
 
 from tempest.common import waiters
+from tempest import config
+
 from whitebox_tempest_plugin.api.compute import base
 from whitebox_tempest_plugin import hardware
 from whitebox_tempest_plugin.services import clients
 
 
+CONF = config.CONF
+
+
 class TestCPUStateMgmt(base.BaseWhiteboxComputeTest):
     """Test Nova's CPU state management feature, ensuring that CPUs are
     onlined and offlined at the expected times.
@@ -28,6 +33,9 @@ class TestCPUStateMgmt(base.BaseWhiteboxComputeTest):
     @classmethod
     def skip_checks(cls):
         super(TestCPUStateMgmt, cls).skip_checks()
+        if not CONF.compute_feature_enabled.cpu_power_management:
+            raise cls.skipException(
+                'Libvirt CPU power is unavailable, skipping.')
 
     def setUp(self):
         super(TestCPUStateMgmt, self).setUp()