diff --git a/keystonemiddleware/tests/client_fixtures.py b/keystonemiddleware/tests/client_fixtures.py
index 0115e4a9..84e5edc1 100644
--- a/keystonemiddleware/tests/client_fixtures.py
+++ b/keystonemiddleware/tests/client_fixtures.py
@@ -236,7 +236,8 @@ class Examples(fixtures.Fixture):
         ROLE_NAME2 = 'role2'
 
         self.SERVICE_TYPE = 'identity'
-        self.SERVICE_URL = 'http://keystone.server:5000/v2.0'
+        self.UNVERSIONED_SERVICE_URL = 'http://keystone.server:5000/'
+        self.SERVICE_URL = self.UNVERSIONED_SERVICE_URL + 'v2.0'
 
         # Old Tokens
 
diff --git a/keystonemiddleware/tests/test_auth_token_middleware.py b/keystonemiddleware/tests/test_auth_token_middleware.py
index bd3bf8bc..5462281f 100644
--- a/keystonemiddleware/tests/test_auth_token_middleware.py
+++ b/keystonemiddleware/tests/test_auth_token_middleware.py
@@ -1298,10 +1298,13 @@ class CommonAuthTokenMiddlewareTest(object):
         self.assertThat(1, matchers.Equals(cache.set.call_count))
 
     def test_auth_plugin(self):
-        httpretty.register_uri(httpretty.GET,
-                               self.examples.SERVICE_URL,
-                               body=VERSION_LIST_v3,
-                               status_code=300)
+
+        for service_url in (self.examples.UNVERSIONED_SERVICE_URL,
+                            self.examples.SERVICE_URL):
+            httpretty.register_uri(httpretty.GET,
+                                   service_url,
+                                   body=VERSION_LIST_v3,
+                                   status_code=300)
 
         req = webob.Request.blank('/')
         req.headers['X-Auth-Token'] = self.token_dict['uuid_token_default']