diff --git a/barbican_tempest_plugin/tests/scenario/barbican_manager.py b/barbican_tempest_plugin/tests/scenario/barbican_manager.py
index 2cf7a7f..8e5d7c4 100644
--- a/barbican_tempest_plugin/tests/scenario/barbican_manager.py
+++ b/barbican_tempest_plugin/tests/scenario/barbican_manager.py
@@ -81,16 +81,16 @@ class BarbicanScenarioTest(mgr.ScenarioTest):
         )
 
         if CONF.compute_feature_enabled.attach_encrypted_volume:
-            if CONF.volume_feature_enabled.api_v2:
-                cls.admin_volume_types_client =\
-                    os_adm.volume_types_v2_client
-                cls.admin_encryption_types_client =\
-                    os_adm.encryption_types_v2_client
-            else:
+            if CONF.volume_feature_enabled.api_v1:
                 cls.admin_volume_types_client =\
                     os_adm.volume_types_client
                 cls.admin_encryption_types_client =\
                     os_adm.encryption_types_client
+            else:
+                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 66d28a5..391fe02 100644
--- a/barbican_tempest_plugin/tests/scenario/manager.py
+++ b/barbican_tempest_plugin/tests/scenario/manager.py
@@ -75,12 +75,12 @@ class ScenarioTest(manager.NetworkScenarioTest):
         cls.security_group_rules_client = (
             cls.os_primary.security_group_rules_client)
 
-        if CONF.volume_feature_enabled.api_v2:
-            cls.volumes_client = cls.os_primary.volumes_v2_client
-            cls.snapshots_client = cls.os_primary.snapshots_v2_client
-        else:
+        if CONF.volume_feature_enabled.api_v1:
             cls.volumes_client = cls.os_primary.volumes_client
             cls.snapshots_client = cls.os_primary.snapshots_client
+        else:
+            cls.volumes_client = cls.os_primary.volumes_client_latest
+            cls.snapshots_client = cls.os_primary.snapshots_client_latest
 
     # ## Test functions library
     #