diff --git a/cinderclient/client.py b/cinderclient/client.py
index fb84861f1..068d05952 100644
--- a/cinderclient/client.py
+++ b/cinderclient/client.py
@@ -701,6 +701,8 @@ def _construct_http_client(username=None, password=None, project_id=None,
     if session:
         kwargs.setdefault('user_agent', 'python-cinderclient')
         kwargs.setdefault('interface', endpoint_type)
+        kwargs.setdefault('endpoint_override', bypass_url)
+
         return SessionClient(session=session,
                              auth=auth,
                              service_type=service_type,
diff --git a/cinderclient/tests/unit/test_shell.py b/cinderclient/tests/unit/test_shell.py
index c82c1b9db..430f4fb1f 100644
--- a/cinderclient/tests/unit/test_shell.py
+++ b/cinderclient/tests/unit/test_shell.py
@@ -240,7 +240,7 @@ class ShellTest(utils.TestCase):
     def test_noauth_plugin(self, mocker):
         os_auth_url = "http://example.com/v2"
         mocker.register_uri('GET',
-                            "%s/admin/volumes/detail"
+                            "%s/volumes/detail"
                             % os_auth_url, text='{"volumes": []}')
         _shell = shell.OpenStackCinderShell()
         args = ['--os-endpoint', os_auth_url,