diff --git a/functionaltests/cli/base.py b/functionaltests/cli/base.py
index 22b9b4f6..6f7384b0 100644
--- a/functionaltests/cli/base.py
+++ b/functionaltests/cli/base.py
@@ -60,9 +60,11 @@ class CmdLineTestCase(BaseTestCase):
             arg_list.extend(
                 ['--os-project-domain-name',
                  CONF.keymanager.project_domain_name])
+            arg_list.extend(['--os-identity-api-version', '3.0'])
         else:
-            arg_list.extend(['--os-auth-url', CONF.identity.auth_uri])
+            arg_list.extend(['--os-auth-url', CONF.identity.uri])
             arg_list.extend(['--os-tenant-name', CONF.keymanager.project_name])
+            arg_list.extend(['--os-identity-api-version', '2.0'])
 
         arg_list.extend(['--os-username', CONF.keymanager.username,
                          '--os-password', CONF.keymanager.password])