diff --git a/cinderclient/shell.py b/cinderclient/shell.py
index 9b9513e6f..401e5f06b 100644
--- a/cinderclient/shell.py
+++ b/cinderclient/shell.py
@@ -265,6 +265,7 @@ class OpenStackCinderShell(object):
         parser.add_argument('--os-tenant-name',
                             metavar='<auth-tenant-name>',
                             default=utils.env('OS_TENANT_NAME',
+                                              'OS_PROJECT_NAME',
                                               'CINDER_PROJECT_ID'),
                             help='Tenant name. '
                             'Default=env[OS_TENANT_NAME].')
@@ -274,6 +275,7 @@ class OpenStackCinderShell(object):
         parser.add_argument('--os-tenant-id',
                             metavar='<auth-tenant-id>',
                             default=utils.env('OS_TENANT_ID',
+                                              'OS_PROJECT_ID',
                                               'CINDER_TENANT_ID'),
                             help='ID for the tenant. '
                             'Default=env[OS_TENANT_ID].')
@@ -732,8 +734,10 @@ class OpenStackCinderShell(object):
 
         username = self.options.os_username
         password = self.options.os_password
-        tenant_id = self.options.os_tenant_id
-        tenant_name = self.options.os_tenant_name
+        tenant_id = (self.options.os_tenant_id
+                     or self.options.os_project_id)
+        tenant_name = (self.options.os_tenant_name
+                       or self.options.os_project_name)
 
         return v2_auth.Password(
             v2_auth_url,
diff --git a/cinderclient/tests/functional/base.py b/cinderclient/tests/functional/base.py
index de8f665e0..8b291b661 100644
--- a/cinderclient/tests/functional/base.py
+++ b/cinderclient/tests/functional/base.py
@@ -34,7 +34,8 @@ def credentials():
 
     username = os.environ.get('OS_USERNAME')
     password = os.environ.get('OS_PASSWORD')
-    tenant_name = os.environ.get('OS_TENANT_NAME')
+    tenant_name = (os.environ.get('OS_TENANT_NAME')
+                   or os.environ.get('OS_PROJECT_NAME'))
     auth_url = os.environ.get('OS_AUTH_URL')
 
     config = six.moves.configparser.RawConfigParser()