diff --git a/functionaltests/api/base.py b/functionaltests/api/base.py
index c50193c77..e3f9ef0b2 100644
--- a/functionaltests/api/base.py
+++ b/functionaltests/api/base.py
@@ -66,13 +66,13 @@ class TestCase(oslotest.BaseTestCase):
         return name
 
 
-class BarbicanCredentials(auth.KeystoneV2Credentials):
+class BarbicanCredentials(auth.KeystoneV3Credentials):
 
     def __init__(self):
         credentials = dict(
             username=CONF.identity.admin_username,
             password=CONF.identity.admin_password,
-            tenant_name=CONF.identity.admin_tenant_name
+            project_name=CONF.identity.admin_tenant_name
         )
 
         super(BarbicanCredentials, self).__init__(**credentials)
diff --git a/functionaltests/common/client.py b/functionaltests/common/client.py
index 60c77841d..cac986ea9 100644
--- a/functionaltests/common/client.py
+++ b/functionaltests/common/client.py
@@ -31,8 +31,8 @@ class BarbicanClientAuth(auth.AuthBase):
 
         self.username = credentials.username
         self.password = credentials.password
-        self.project_id = credentials.tenant_id
-        self.project_name = credentials.tenant_name
+        self.project_id = credentials.project_id
+        self.project_name = credentials.project_name
         self.token = auth_provider.get_token()
 
     def __call__(self, r):