diff --git a/monikerclient/v1/__init__.py b/monikerclient/v1/__init__.py
index 67027fe..c02052a 100644
--- a/monikerclient/v1/__init__.py
+++ b/monikerclient/v1/__init__.py
@@ -41,7 +41,10 @@ class Client(object):
             auth = KeystoneAuth(auth_url, username, password, tenant_id,
                                 tenant_name, token, service_type,
                                 endpoint_type, sudo_tenant_id)
-            self.endpoint = auth.get_url()
+            if endpoint:
+                self.endpoint = endpoint
+            else:
+                self.endpoint = auth.get_url()
         elif endpoint:
             auth = None
             self.endpoint = endpoint