diff --git a/contrib/heat_keystoneclient_v2/heat_keystoneclient_v2/client.py b/contrib/heat_keystoneclient_v2/heat_keystoneclient_v2/client.py
index 5ae2e7d541..4ef21d4157 100644
--- a/contrib/heat_keystoneclient_v2/heat_keystoneclient_v2/client.py
+++ b/contrib/heat_keystoneclient_v2/heat_keystoneclient_v2/client.py
@@ -65,6 +65,7 @@ class KeystoneClientV2(object):
     def _v2_client_init(self):
         kwargs = {
             'auth_url': self.context.auth_url,
+            'endpoint': self.context.auth_url,
             'region_name': cfg.CONF.region_name_for_services
         }
 
diff --git a/contrib/heat_keystoneclient_v2/heat_keystoneclient_v2/tests/test_client.py b/contrib/heat_keystoneclient_v2/heat_keystoneclient_v2/tests/test_client.py
index c79914b30c..f66438ec1d 100644
--- a/contrib/heat_keystoneclient_v2/heat_keystoneclient_v2/tests/test_client.py
+++ b/contrib/heat_keystoneclient_v2/heat_keystoneclient_v2/tests/test_client.py
@@ -52,6 +52,7 @@ class KeystoneClientTest(common.HeatTestCase):
         if method == 'token':
             heat_keystoneclient.kc.Client(
                 auth_url=mox.IgnoreArg(),
+                endpoint=mox.IgnoreArg(),
                 tenant_name='test_tenant',
                 token='abcd1234',
                 cacert=None,
@@ -63,6 +64,7 @@ class KeystoneClientTest(common.HeatTestCase):
         elif method == 'password':
             heat_keystoneclient.kc.Client(
                 auth_url=mox.IgnoreArg(),
+                endpoint=mox.IgnoreArg(),
                 tenant_name='test_tenant',
                 tenant_id='test_tenant_id',
                 username='test_username',
@@ -76,6 +78,7 @@ class KeystoneClientTest(common.HeatTestCase):
         if method == 'trust':
             heat_keystoneclient.kc.Client(
                 auth_url='http://server.test:5000/v2.0',
+                endpoint='http://server.test:5000/v2.0',
                 password='verybadpass',
                 tenant_name='service',
                 username='heat',