diff --git a/tempest/api/volume/admin/v2/test_snapshot_manage.py b/tempest/api/volume/admin/v2/test_snapshot_manage.py
index 98f6d32..6a3f9ee 100644
--- a/tempest/api/volume/admin/v2/test_snapshot_manage.py
+++ b/tempest/api/volume/admin/v2/test_snapshot_manage.py
@@ -32,9 +32,8 @@
     """
 
     @test.idempotent_id('0132f42d-0147-4b45-8501-cc504bbf7810')
-    @testtools.skipIf(CONF.volume.storage_protocol == 'ceph',
-                      'Currently, Ceph does not support '
-                      'unmanage/manage snapshot')
+    @testtools.skipUnless(CONF.volume_feature_enabled.manage_snapshot,
+                          "Manage snapshot tests are disabled")
     def test_unmanage_manage_snapshot(self):
         # Create a volume
         volume = self.create_volume()
diff --git a/tempest/config.py b/tempest/config.py
index ea7811d..4162718 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -804,6 +804,9 @@
     cfg.BoolOpt('clone',
                 default=True,
                 help='Runs Cinder volume clone test'),
+    cfg.BoolOpt('manage_snapshot',
+                default=False,
+                help='Runs Cinder manage snapshot tests'),
     cfg.ListOpt('api_extensions',
                 default=['all'],
                 help='A list of enabled volume extensions with a special '