diff --git a/heatclient/shell.py b/heatclient/shell.py
index 0abaf007..56ce0878 100644
--- a/heatclient/shell.py
+++ b/heatclient/shell.py
@@ -220,12 +220,15 @@ class HeatShell(object):
         :param tenant_name: name of tenant
         :param auth_url: endpoint to authenticate against
         """
-        return ksclient.Client(username=kwargs.get('username'),
-                               password=kwargs.get('password'),
-                               tenant_id=kwargs.get('tenant_id'),
-                               tenant_name=kwargs.get('tenant_name'),
-                               auth_url=kwargs.get('auth_url'),
-                               insecure=kwargs.get('insecure'))
+        kc_args = {'auth_url': kwargs.get('auth_url'),
+                   'insecure': kwargs.get('insecure'),
+                   'username': kwargs.get('username'),
+                   'password': kwargs.get('password')}
+        if kwargs.get('tenant_id'):
+            kc_args['tenant_id'] = kwargs.get('tenant_id')
+        else:
+            kc_args['tenant_name'] = kwargs.get('tenant_name')
+        return ksclient.Client(**kc_args)
 
     def _get_endpoint(self, client, **kwargs):
         """Get an endpoint using the provided keystone client."""
diff --git a/heatclient/tests/fakes.py b/heatclient/tests/fakes.py
index 199dad9f..51ef8fac 100644
--- a/heatclient/tests/fakes.py
+++ b/heatclient/tests/fakes.py
@@ -22,7 +22,6 @@ def script_keystone_client():
     ksclient.Client(auth_url='http://no.where',
                     insecure=False,
                     password='password',
-                    tenant_id='',
                     tenant_name='tenant_name',
                     username='username').AndReturn(FakeKeystone('abcd1234'))