diff --git a/castellan/key_manager/barbican_key_manager.py b/castellan/key_manager/barbican_key_manager.py
index 76add421..e78715a6 100644
--- a/castellan/key_manager/barbican_key_manager.py
+++ b/castellan/key_manager/barbican_key_manager.py
@@ -53,7 +53,7 @@ barbican_opts = [
     cfg.StrOpt('barbican_api_version',
                help='Version of the Barbican API, for example: "v1"'),
     cfg.StrOpt('auth_endpoint',
-               default='http://localhost:5000/v3',
+               default='http://localhost/identity/v3',
                help='Use this endpoint to connect to Keystone'),
     cfg.IntOpt('retry_delay',
                default=1,
diff --git a/castellan/tests/functional/config.py b/castellan/tests/functional/config.py
index 8345ef47..cd3aecf2 100644
--- a/castellan/tests/functional/config.py
+++ b/castellan/tests/functional/config.py
@@ -22,7 +22,7 @@ TEST_CONF = None
 identity_group = cfg.OptGroup(name='identity')
 identity_options = [
     cfg.StrOpt('auth_url',
-               default='http://localhost:5000/v3',
+               default='http://localhost/identity/v3',
                help='Keystone endpoint'),
     cfg.StrOpt('username',
                default='admin',
diff --git a/castellan/tests/unit/test_options.py b/castellan/tests/unit/test_options.py
index 5a1749b0..280e4e6f 100644
--- a/castellan/tests/unit/test_options.py
+++ b/castellan/tests/unit/test_options.py
@@ -39,7 +39,7 @@ class TestOptions(base.TestCase):
         self.assertEqual(barbican_api_version,
                          conf.get(bkm.BARBICAN_OPT_GROUP).barbican_api_version)
 
-        auth_endpoint = 'http://test-server.org:5000/'
+        auth_endpoint = 'http://test-server.org/identity'
         options.set_defaults(conf, auth_endpoint=auth_endpoint)
         self.assertEqual(auth_endpoint,
                          conf.get(bkm.BARBICAN_OPT_GROUP).auth_endpoint)
diff --git a/doc/source/testing.rst b/doc/source/testing.rst
index 46ad31db..7c7f3141 100644
--- a/doc/source/testing.rst
+++ b/doc/source/testing.rst
@@ -69,7 +69,7 @@ The file should look something like the following:
     username = 'admin'
     password = 'openstack'
     project_name = 'admin'
-    auth_url = 'http://localhost:5000/v3'
+    auth_url = 'http://localhost/identity/v3'
 
 Once you have the appropriate services running and configured you can execute
 the functional tests through tox.
diff --git a/doc/source/usage.rst b/doc/source/usage.rst
index b1508a20..aaa172e1 100644
--- a/doc/source/usage.rst
+++ b/doc/source/usage.rst
@@ -95,7 +95,7 @@ that is being abstracted.
     username = 'admin'
     password = 'openstack'
     project_name = 'admin'
-    auth_url = 'http://localhost:5000/'
+    auth_url = 'http://localhost/identity/v3'
     auth = identity.Password(auth_url=auth_url,
                              username=username,
                              password=password,