diff --git a/functionaltests/cli/v1/behaviors/base_behaviors.py b/functionaltests/cli/v1/behaviors/base_behaviors.py
index bc19d039..3514e6c1 100644
--- a/functionaltests/cli/v1/behaviors/base_behaviors.py
+++ b/functionaltests/cli/v1/behaviors/base_behaviors.py
@@ -46,20 +46,22 @@ class BaseBehaviors(object):
         :return: the argument list is updated with the authentication and
         endpoint args
         """
+
         if 'v3' in CONF.identity.auth_version.lower():
             arg_list.extend(['--os-auth-url', CONF.identity.uri_v3])
-            arg_list.extend(
-                ['--os-project-name', CONF.keymanager.project_name])
+            arg_list.extend(['--os-project-name', CONF.keymanager.project_name])
             # NOTE(jaosorior): Should we add the user_domain_name to the
-            # config?
+            #                  config?
             arg_list.extend(
                 ['--os-user-domain-name', CONF.keymanager.project_domain_name])
             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])