diff --git a/tests/test_keystoneclient.py b/tests/test_keystoneclient.py
index 5c0d2f5bce..07bcdac4be 100644
--- a/tests/test_keystoneclient.py
+++ b/tests/test_keystoneclient.py
@@ -38,6 +38,9 @@ class CompatTestCase(test.TestCase):
     def setUp(self):
         super(CompatTestCase, self).setUp()
 
+        self.public_server = self.serveapp('keystone', name='main')
+        self.admin_server = self.serveapp('keystone', name='admin')
+
         revdir = test.checkout_vendor(*self.get_checkout())
         self.add_path(revdir)
         self.clear_module('keystoneclient')
@@ -46,9 +49,6 @@ def setUp(self):
         self.token_provider_api = token.provider.Manager()
         self.load_fixtures(default_fixtures)
 
-        self.public_server = self.serveapp('keystone', name='main')
-        self.admin_server = self.serveapp('keystone', name='admin')
-
         # TODO(termie): add an admin user to the fixtures and use that user
         # override the fixtures, for now
         self.metadata_foobar = self.identity_api.add_role_to_user_and_project(