diff --git a/docs/install.rst b/docs/install.rst
index cd08f7d98..9e174a9da 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -98,7 +98,7 @@ editor. You will want to customize several settings:
    environment. (They should be correct unless you modified your
    OpenStack server to change them.)
 -  ``TUSKAR_ENDPOINT_URL`` should point to the Tuskar server you
-   configured. It normally runs on port 6385.
+   configured. It normally runs on port 8585.
 -  ``REMOTE_NOVA_BAREMETAL_CREDS`` is optional. It's a dictionary of settings
    for connecting to a remote Nova Baremetal. If not set, this information is
    gathered from Keystone's service catalog, but a common configuration with
diff --git a/local_settings.py.example b/local_settings.py.example
index acc09d586..ac2ec28bd 100644
--- a/local_settings.py.example
+++ b/local_settings.py.example
@@ -379,7 +379,7 @@ SECURITY_GROUP_RULES = {
     },
 }
 
-TUSKAR_ENDPOINT_URL = "http://127.0.0.1:6385"
+TUSKAR_ENDPOINT_URL = "http://127.0.0.1:8585"
 
 # The REMOTE_NOVA_BAREMETAL_CREDS settings can be used to connect to a remote
 # Nova Baremetal instance instead of the one defined in the Keystone service
diff --git a/tuskar_ui/test/settings.py b/tuskar_ui/test/settings.py
index 8b22b8ce1..2d44d43fc 100644
--- a/tuskar_ui/test/settings.py
+++ b/tuskar_ui/test/settings.py
@@ -135,7 +135,7 @@ NOSE_ARGS = ['--nocapture',
              '--cover-inclusive',
              '--all-modules']
 
-TUSKAR_ENDPOINT_URL = "http://127.0.0.1:6385"
+TUSKAR_ENDPOINT_URL = "http://127.0.0.1:8585"
 
 OVERCLOUD_CREDS = {
     'enabled': True,