diff --git a/barbican_tempest_plugin/tests/scenario/barbican_manager.py b/barbican_tempest_plugin/tests/scenario/barbican_manager.py
index d560a63..64cc9a2 100644
--- a/barbican_tempest_plugin/tests/scenario/barbican_manager.py
+++ b/barbican_tempest_plugin/tests/scenario/barbican_manager.py
@@ -79,12 +79,10 @@
         )
 
         if CONF.compute_feature_enabled.attach_encrypted_volume:
-            if (CONF.volume_feature_enabled.api_v2 or
-               CONF.volume_feature_enabled.api_v3):
-                cls.admin_volume_types_client =\
-                    os_adm.volume_types_v2_client
-                cls.admin_encryption_types_client =\
-                    os_adm.encryption_types_v2_client
+            cls.admin_volume_types_client =\
+                os_adm.volume_types_v2_client
+            cls.admin_encryption_types_client =\
+                os_adm.encryption_types_v2_client
 
     def _get_uuid(self, href):
         return href.split('/')[-1]
diff --git a/barbican_tempest_plugin/tests/scenario/manager.py b/barbican_tempest_plugin/tests/scenario/manager.py
index 8be324a..f91e27b 100644
--- a/barbican_tempest_plugin/tests/scenario/manager.py
+++ b/barbican_tempest_plugin/tests/scenario/manager.py
@@ -75,10 +75,8 @@
         cls.security_group_rules_client = (
             cls.os_primary.security_group_rules_client)
 
-        if (CONF.volume_feature_enabled.api_v2 or
-           CONF.volume_feature_enabled.api_v3):
-            cls.volumes_client = cls.os_primary.volumes_client_latest
-            cls.snapshots_client = cls.os_primary.snapshots_client_latest
+        cls.volumes_client = cls.os_primary.volumes_client_latest
+        cls.snapshots_client = cls.os_primary.snapshots_client_latest
 
     # ## Test functions library
     #