diff --git a/cinder/tests/tempest/api/volume/test_volume_revert.py b/cinder/tests/tempest/api/volume/test_volume_revert.py
index 7314fdb..1f4bead 100644
--- a/cinder/tests/tempest/api/volume/test_volume_revert.py
+++ b/cinder/tests/tempest/api/volume/test_volume_revert.py
@@ -27,6 +27,12 @@
     min_microversion = '3.40'
 
     @classmethod
+    def skip_checks(cls):
+        super(VolumeRevertTests, cls).skip_checks()
+        if not CONF.volume_feature_enabled.volume_revert:
+            raise cls.skipException("Cinder volume revert feature disabled")
+
+    @classmethod
     def setup_clients(cls):
         cls._api_version = 3
         super(VolumeRevertTests, cls).setup_clients()
diff --git a/cinder/tests/tempest/config.py b/cinder/tests/tempest/config.py
index f4eb098..e15a399 100644
--- a/cinder/tests/tempest/config.py
+++ b/cinder/tests/tempest/config.py
@@ -19,4 +19,7 @@
     cfg.BoolOpt('consistency_group',
                 default=False,
                 help='Enable to run Cinder volume consistency group tests'),
+    cfg.BoolOpt('volume_revert',
+                default=False,
+                help='Enable to run Cinder volume revert tests'),
 ]
diff --git a/cinder/tests/tempest/services/volume_revert_client.py b/cinder/tests/tempest/services/volume_revert_client.py
index 285494a..0d54701 100644
--- a/cinder/tests/tempest/services/volume_revert_client.py
+++ b/cinder/tests/tempest/services/volume_revert_client.py
@@ -15,7 +15,7 @@
 
 from oslo_serialization import jsonutils as json
 from tempest.lib.common import rest_client
-from tempest.lib.services.volume.v3 import base_client
+from tempest.lib.services.volume import base_client
 
 
 class VolumeRevertClient(base_client.BaseClient):