diff --git a/keystoneclient/adapter.py b/keystoneclient/adapter.py
index 3cb4dc4e0..ea0d342aa 100644
--- a/keystoneclient/adapter.py
+++ b/keystoneclient/adapter.py
@@ -116,6 +116,9 @@ class Adapter(object):
         :returns: An endpoint if available or None.
         :rtype: string
         """
+        if self.endpoint_override:
+            return self.endpoint_override
+
         self._set_endpoint_filter_kwargs(kwargs)
         return self.session.get_endpoint(auth or self.auth, **kwargs)
 
diff --git a/keystoneclient/tests/test_session.py b/keystoneclient/tests/test_session.py
index 6a9d4080d..736dd697e 100644
--- a/keystoneclient/tests/test_session.py
+++ b/keystoneclient/tests/test_session.py
@@ -689,6 +689,8 @@ class AdapterTest(utils.TestCase):
         self.assertEqual(response, resp.text)
         self.assertEqual(endpoint_url, self.requests.last_request.url)
 
+        self.assertEqual(endpoint_override, adpt.get_endpoint())
+
     def test_adapter_invalidate(self):
         auth = CalledAuthPlugin()
         sess = client_session.Session()