diff --git a/doc/source/testing.rst b/doc/source/testing.rst
index 0f8a46c84..97a6491c1 100644
--- a/doc/source/testing.rst
+++ b/doc/source/testing.rst
@@ -53,7 +53,7 @@ An example test.conf file::
     os_auth_url=http://192.168.0.2:5000/v2.0/
     os_username=admin
     os_password=admin
-    os_tenant_name=admin
+    os_project_name=admin
 
 If you are testing ironic in standalone mode, only the parameters
 'auth_strategy', 'os_auth_token' and 'ironic_url' are required;
diff --git a/ironicclient/tests/functional/base.py b/ironicclient/tests/functional/base.py
index 1110787f0..9000e6a7b 100644
--- a/ironicclient/tests/functional/base.py
+++ b/ironicclient/tests/functional/base.py
@@ -42,7 +42,7 @@ class FunctionalTestBase(base.ClientTestBase):
             client = base.CLIClient(cli_dir=cli_dir,
                                     username=config['os_username'],
                                     password=config['os_password'],
-                                    tenant_name=config['os_tenant_name'],
+                                    tenant_name=config['os_project_name'],
                                     uri=config['os_auth_url'])
             for keystone_object in 'user', 'project':
                 domain_attr = 'os_%s_domain_id' % keystone_object
@@ -79,7 +79,7 @@ class FunctionalTestBase(base.ClientTestBase):
         keystone_v3_conf_settings = []
         if auth_strategy == 'keystone':
             conf_settings += ['os_auth_url', 'os_username',
-                              'os_password', 'os_tenant_name']
+                              'os_password', 'os_project_name']
             keystone_v3_conf_settings += ['os_user_domain_id',
                                           'os_project_domain_id']
         else:
diff --git a/tools/run_functional.sh b/tools/run_functional.sh
index a789573ce..e9725192b 100755
--- a/tools/run_functional.sh
+++ b/tools/run_functional.sh
@@ -19,11 +19,11 @@ os_auth_url=$OS_AUTH_URL
 os_identity_api_version = $OS_IDENTITY_API_VERSION
 os_username=$OS_USERNAME
 os_password=$OS_PASSWORD
-os_tenant_name=$OS_TENANT_NAME
+os_project_name=$OS_PROJECT_NAME
 os_user_domain_id=$OS_USER_DOMAIN_ID
 os_project_domain_id=$OS_PROJECT_DOMAIN_ID
 os_service_type=baremetal
 os_endpoint_type=public
 END
 fi
-tox -e  functional
+tox -e functional