diff --git a/django-openstack/django_openstack/test.py b/django-openstack/django_openstack/test.py
index bf428b6b8..9540ba188 100644
--- a/django-openstack/django_openstack/test.py
+++ b/django-openstack/django_openstack/test.py
@@ -61,7 +61,7 @@ class TestCase(test.TestCase):
         "name": "glance"
     }, {
         "endpoints": [{
-            "adminURL": "http://cdn.admin-nets.local:5001/v2.0",
+            "adminURL": "http://cdn.admin-nets.local:35357/v2.0",
             "region": "RegionOne",
             "internalURL": "http://127.0.0.1:5000/v2.0",
             "publicURL": "http://cdn.admin-nets.local:5000/v2.0"
diff --git a/openstack-dashboard/local/local_settings.py.example b/openstack-dashboard/local/local_settings.py.example
index 6ebc4f16b..7a53d2624 100644
--- a/openstack-dashboard/local/local_settings.py.example
+++ b/openstack-dashboard/local/local_settings.py.example
@@ -34,7 +34,7 @@ MAILER_EMAIL_BACKEND = EMAIL_BACKEND
 OPENSTACK_KEYSTONE_URL = "http://localhost:5000/v2.0/"
 # FIXME: this is only needed until keystone fixes its GET /tenants call
 # so that it doesn't return everything for admins
-OPENSTACK_KEYSTONE_ADMIN_URL = "http://localhost:5001/v2.0"
+OPENSTACK_KEYSTONE_ADMIN_URL = "http://localhost:35357/v2.0"
 OPENSTACK_KEYSTONE_DEFAULT_ROLE = "Member"
 
 # NOTE(tres): Available services should come from the service