diff --git a/keystoneclient/tests/unit/v2_0/test_certificates.py b/keystoneclient/tests/unit/v2_0/test_certificates.py
index fc19d8119..4f689d9ad 100644
--- a/keystoneclient/tests/unit/v2_0/test_certificates.py
+++ b/keystoneclient/tests/unit/v2_0/test_certificates.py
@@ -17,7 +17,7 @@ from keystoneclient.tests.unit import client_fixtures
 from keystoneclient.tests.unit.v2_0 import utils
 
 
-class CertificateTests(utils.TestCase, testresources.ResourcedTestCase):
+class CertificateTests(utils.ClientTestCase, testresources.ResourcedTestCase):
 
     resources = [('examples', client_fixtures.EXAMPLES_RESOURCE)]
 
diff --git a/keystoneclient/tests/unit/v2_0/test_ec2.py b/keystoneclient/tests/unit/v2_0/test_ec2.py
index e08d228f2..3df053de1 100644
--- a/keystoneclient/tests/unit/v2_0/test_ec2.py
+++ b/keystoneclient/tests/unit/v2_0/test_ec2.py
@@ -14,7 +14,7 @@ from keystoneclient.tests.unit.v2_0 import utils
 from keystoneclient.v2_0 import ec2
 
 
-class EC2Tests(utils.TestCase):
+class EC2Tests(utils.ClientTestCase):
 
     def test_create(self):
         user_id = 'usr'
diff --git a/keystoneclient/tests/unit/v2_0/test_endpoints.py b/keystoneclient/tests/unit/v2_0/test_endpoints.py
index ffc1c65d1..7b15cccc9 100644
--- a/keystoneclient/tests/unit/v2_0/test_endpoints.py
+++ b/keystoneclient/tests/unit/v2_0/test_endpoints.py
@@ -16,7 +16,7 @@ from keystoneclient.tests.unit.v2_0 import utils
 from keystoneclient.v2_0 import endpoints
 
 
-class EndpointTests(utils.TestCase):
+class EndpointTests(utils.ClientTestCase):
     def setUp(self):
         super(EndpointTests, self).setUp()
         self.TEST_ENDPOINTS = {
diff --git a/keystoneclient/tests/unit/v2_0/test_extensions.py b/keystoneclient/tests/unit/v2_0/test_extensions.py
index d09943f4b..662d380e7 100644
--- a/keystoneclient/tests/unit/v2_0/test_extensions.py
+++ b/keystoneclient/tests/unit/v2_0/test_extensions.py
@@ -14,7 +14,7 @@ from keystoneclient.tests.unit.v2_0 import utils
 from keystoneclient.v2_0 import extensions
 
 
-class ExtensionTests(utils.TestCase):
+class ExtensionTests(utils.ClientTestCase):
     def setUp(self):
         super(ExtensionTests, self).setUp()
         self.TEST_EXTENSIONS = {
diff --git a/keystoneclient/tests/unit/v2_0/test_roles.py b/keystoneclient/tests/unit/v2_0/test_roles.py
index 74ad1ed54..fab21383c 100644
--- a/keystoneclient/tests/unit/v2_0/test_roles.py
+++ b/keystoneclient/tests/unit/v2_0/test_roles.py
@@ -16,7 +16,7 @@ from keystoneclient.tests.unit.v2_0 import utils
 from keystoneclient.v2_0 import roles
 
 
-class RoleTests(utils.TestCase):
+class RoleTests(utils.ClientTestCase):
     def setUp(self):
         super(RoleTests, self).setUp()
 
diff --git a/keystoneclient/tests/unit/v2_0/test_services.py b/keystoneclient/tests/unit/v2_0/test_services.py
index 21727453e..f57f7430e 100644
--- a/keystoneclient/tests/unit/v2_0/test_services.py
+++ b/keystoneclient/tests/unit/v2_0/test_services.py
@@ -16,7 +16,7 @@ from keystoneclient.tests.unit.v2_0 import utils
 from keystoneclient.v2_0 import services
 
 
-class ServiceTests(utils.TestCase):
+class ServiceTests(utils.ClientTestCase):
     def setUp(self):
         super(ServiceTests, self).setUp()
 
diff --git a/keystoneclient/tests/unit/v2_0/test_tenants.py b/keystoneclient/tests/unit/v2_0/test_tenants.py
index 279a8fdeb..50c3aa18d 100644
--- a/keystoneclient/tests/unit/v2_0/test_tenants.py
+++ b/keystoneclient/tests/unit/v2_0/test_tenants.py
@@ -20,7 +20,7 @@ from keystoneclient.v2_0 import tenants
 from keystoneclient.v2_0 import users
 
 
-class TenantTests(utils.TestCase):
+class TenantTests(utils.ClientTestCase):
     def setUp(self):
         super(TenantTests, self).setUp()
 
diff --git a/keystoneclient/tests/unit/v2_0/test_tokens.py b/keystoneclient/tests/unit/v2_0/test_tokens.py
index 968080b74..1b7f2d6d5 100644
--- a/keystoneclient/tests/unit/v2_0/test_tokens.py
+++ b/keystoneclient/tests/unit/v2_0/test_tokens.py
@@ -20,7 +20,7 @@ from keystoneclient.v2_0 import client
 from keystoneclient.v2_0 import tokens
 
 
-class TokenTests(utils.TestCase):
+class TokenTests(utils.ClientTestCase):
 
     def test_delete(self):
         id_ = uuid.uuid4().hex
diff --git a/keystoneclient/tests/unit/v2_0/test_users.py b/keystoneclient/tests/unit/v2_0/test_users.py
index 455ca3cf5..0babc081c 100644
--- a/keystoneclient/tests/unit/v2_0/test_users.py
+++ b/keystoneclient/tests/unit/v2_0/test_users.py
@@ -17,7 +17,7 @@ from keystoneclient.v2_0 import roles
 from keystoneclient.v2_0 import users
 
 
-class UserTests(utils.TestCase):
+class UserTests(utils.ClientTestCase):
     def setUp(self):
         super(UserTests, self).setUp()
         self.ADMIN_USER_ID = uuid.uuid4().hex
diff --git a/keystoneclient/tests/unit/v2_0/utils.py b/keystoneclient/tests/unit/v2_0/utils.py
index 2ced22662..3dfe762a8 100644
--- a/keystoneclient/tests/unit/v2_0/utils.py
+++ b/keystoneclient/tests/unit/v2_0/utils.py
@@ -76,14 +76,17 @@ class TestCase(UnauthenticatedTestCase):
         "name": "swift"
     }]
 
+    def stub_auth(self, **kwargs):
+        self.stub_url('POST', ['tokens'], **kwargs)
+
+
+class ClientTestCase(TestCase):
+
     def setUp(self):
-        super(TestCase, self).setUp()
+        super(ClientTestCase, self).setUp()
 
         # Creating a Client not using session is deprecated.
         with self.deprecations.expect_deprecations_here():
             self.client = client.Client(token=self.TEST_TOKEN,
                                         auth_url=self.TEST_URL,
                                         endpoint=self.TEST_URL)
-
-    def stub_auth(self, **kwargs):
-        self.stub_url('POST', ['tokens'], **kwargs)
diff --git a/keystoneclient/tests/unit/v3/test_auth_manager.py b/keystoneclient/tests/unit/v3/test_auth_manager.py
index 68f00c625..5dfbf6805 100644
--- a/keystoneclient/tests/unit/v3/test_auth_manager.py
+++ b/keystoneclient/tests/unit/v3/test_auth_manager.py
@@ -12,15 +12,12 @@
 
 import uuid
 
-from keystoneclient.auth.identity import v3
 from keystoneclient import fixture
-from keystoneclient import session
 from keystoneclient.tests.unit.v3 import utils
 from keystoneclient.v3 import auth
-from keystoneclient.v3 import client
 
 
-class AuthProjectsTest(utils.TestCase):
+class AuthProjectsTest(utils.ClientTestCase):
 
     def setUp(self):
         super(AuthProjectsTest, self).setUp()
@@ -32,12 +29,6 @@ class AuthProjectsTest(utils.TestCase):
                       [],
                       json={'version': fixture.V3Discovery(self.TEST_URL)})
 
-        self.auth = v3.Password(auth_url=self.TEST_URL,
-                                user_id=self.v3token.user_id,
-                                password=uuid.uuid4().hex)
-        self.session = session.Session(auth=self.auth)
-        self.client = client.Client(session=self.session)
-
     def create_resource(self, id=None, name=None, **kwargs):
         kwargs['id'] = id or uuid.uuid4().hex
         kwargs['name'] = name or uuid.uuid4().hex
diff --git a/keystoneclient/tests/unit/v3/test_auth_saml2.py b/keystoneclient/tests/unit/v3/test_auth_saml2.py
index e8eb9f191..96c41b99b 100644
--- a/keystoneclient/tests/unit/v3/test_auth_saml2.py
+++ b/keystoneclient/tests/unit/v3/test_auth_saml2.py
@@ -655,7 +655,7 @@ class AuthenticateviaADFSTests(utils.TestCase):
         self.assertEqual(saml2_fixtures.UNSCOPED_TOKEN['token'], token_json)
 
 
-class SAMLGenerationTests(utils.TestCase):
+class SAMLGenerationTests(utils.ClientTestCase):
 
     def setUp(self):
         super(SAMLGenerationTests, self).setUp()
diff --git a/keystoneclient/tests/unit/v3/test_credentials.py b/keystoneclient/tests/unit/v3/test_credentials.py
index 69c60685f..75435417e 100644
--- a/keystoneclient/tests/unit/v3/test_credentials.py
+++ b/keystoneclient/tests/unit/v3/test_credentials.py
@@ -16,7 +16,7 @@ from keystoneclient.tests.unit.v3 import utils
 from keystoneclient.v3 import credentials
 
 
-class CredentialTests(utils.TestCase, utils.CrudTests):
+class CredentialTests(utils.ClientTestCase, utils.CrudTests):
     def setUp(self):
         super(CredentialTests, self).setUp()
         self.key = 'credential'
diff --git a/keystoneclient/tests/unit/v3/test_domains.py b/keystoneclient/tests/unit/v3/test_domains.py
index 4dbfd73d7..72a7b8833 100644
--- a/keystoneclient/tests/unit/v3/test_domains.py
+++ b/keystoneclient/tests/unit/v3/test_domains.py
@@ -16,7 +16,7 @@ from keystoneclient.tests.unit.v3 import utils
 from keystoneclient.v3 import domains
 
 
-class DomainTests(utils.TestCase, utils.CrudTests):
+class DomainTests(utils.ClientTestCase, utils.CrudTests):
     def setUp(self):
         super(DomainTests, self).setUp()
         self.key = 'domain'
diff --git a/keystoneclient/tests/unit/v3/test_ec2.py b/keystoneclient/tests/unit/v3/test_ec2.py
index ff463b0a8..66679f605 100644
--- a/keystoneclient/tests/unit/v3/test_ec2.py
+++ b/keystoneclient/tests/unit/v3/test_ec2.py
@@ -14,7 +14,7 @@ from keystoneclient.tests.unit.v3 import utils
 from keystoneclient.v3 import ec2
 
 
-class EC2Tests(utils.TestCase):
+class EC2Tests(utils.ClientTestCase):
 
     def test_create(self):
         user_id = 'usr'
diff --git a/keystoneclient/tests/unit/v3/test_endpoint_filter.py b/keystoneclient/tests/unit/v3/test_endpoint_filter.py
index eaca264c7..2eed70586 100644
--- a/keystoneclient/tests/unit/v3/test_endpoint_filter.py
+++ b/keystoneclient/tests/unit/v3/test_endpoint_filter.py
@@ -37,7 +37,7 @@ class EndpointTestUtils(object):
         return kwargs
 
 
-class EndpointFilterTests(utils.TestCase, EndpointTestUtils):
+class EndpointFilterTests(utils.ClientTestCase, EndpointTestUtils):
     """Test project-endpoint associations (a.k.a. EndpointFilter Extension).
 
     Endpoint filter provides associations between service endpoints and
diff --git a/keystoneclient/tests/unit/v3/test_endpoint_policy.py b/keystoneclient/tests/unit/v3/test_endpoint_policy.py
index ce9efb4c6..69d90ae5a 100644
--- a/keystoneclient/tests/unit/v3/test_endpoint_policy.py
+++ b/keystoneclient/tests/unit/v3/test_endpoint_policy.py
@@ -18,7 +18,7 @@ from keystoneclient.tests.unit.v3 import test_endpoint_filter
 from keystoneclient.tests.unit.v3 import utils
 
 
-class EndpointPolicyTests(utils.TestCase,
+class EndpointPolicyTests(utils.ClientTestCase,
                           test_endpoint_filter.EndpointTestUtils):
     """Test policy-endpoint associations (a.k.a. EndpointPolicy Extension)."""
 
diff --git a/keystoneclient/tests/unit/v3/test_endpoints.py b/keystoneclient/tests/unit/v3/test_endpoints.py
index 96f4f4630..40fc03be8 100644
--- a/keystoneclient/tests/unit/v3/test_endpoints.py
+++ b/keystoneclient/tests/unit/v3/test_endpoints.py
@@ -17,7 +17,7 @@ from keystoneclient.tests.unit.v3 import utils
 from keystoneclient.v3 import endpoints
 
 
-class EndpointTests(utils.TestCase, utils.CrudTests):
+class EndpointTests(utils.ClientTestCase, utils.CrudTests):
     def setUp(self):
         super(EndpointTests, self).setUp()
         self.key = 'endpoint'
diff --git a/keystoneclient/tests/unit/v3/test_federation.py b/keystoneclient/tests/unit/v3/test_federation.py
index 5782aa648..cfa6f0bed 100644
--- a/keystoneclient/tests/unit/v3/test_federation.py
+++ b/keystoneclient/tests/unit/v3/test_federation.py
@@ -26,7 +26,7 @@ from keystoneclient.v3 import domains
 from keystoneclient.v3 import projects
 
 
-class IdentityProviderTests(utils.TestCase, utils.CrudTests):
+class IdentityProviderTests(utils.ClientTestCase, utils.CrudTests):
     def setUp(self):
         super(IdentityProviderTests, self).setUp()
         self.key = 'identity_provider'
@@ -88,7 +88,7 @@ class IdentityProviderTests(utils.TestCase, utils.CrudTests):
         self.assertEntityRequestBodyIs(req_ref)
 
 
-class MappingTests(utils.TestCase, utils.CrudTests):
+class MappingTests(utils.ClientTestCase, utils.CrudTests):
     def setUp(self):
         super(MappingTests, self).setUp()
         self.key = 'mapping'
@@ -122,7 +122,7 @@ class MappingTests(utils.TestCase, utils.CrudTests):
         self.assertEntityRequestBodyIs(manager_ref)
 
 
-class ProtocolTests(utils.TestCase, utils.CrudTests):
+class ProtocolTests(utils.ClientTestCase, utils.CrudTests):
     def setUp(self):
         super(ProtocolTests, self).setUp()
         self.key = 'protocol'
@@ -327,14 +327,14 @@ class ProtocolTests(utils.TestCase, utils.CrudTests):
         self.assertEntityRequestBodyIs(request_body)
 
 
-class EntityManagerTests(utils.TestCase):
+class EntityManagerTests(utils.ClientTestCase):
     def test_create_object_expect_fail(self):
         self.assertRaises(TypeError,
                           base.EntityManager,
                           self.client)
 
 
-class FederationProjectTests(utils.TestCase):
+class FederationProjectTests(utils.ClientTestCase):
 
     def setUp(self):
         super(FederationProjectTests, self).setUp()
@@ -364,7 +364,7 @@ class FederationProjectTests(utils.TestCase):
             self.assertIsInstance(project, self.model)
 
 
-class FederationDomainTests(utils.TestCase):
+class FederationDomainTests(utils.ClientTestCase):
 
     def setUp(self):
         super(FederationDomainTests, self).setUp()
@@ -394,7 +394,7 @@ class FederationDomainTests(utils.TestCase):
             self.assertIsInstance(domain, self.model)
 
 
-class FederatedTokenTests(utils.TestCase):
+class FederatedTokenTests(utils.ClientTestCase):
 
     def setUp(self):
         super(FederatedTokenTests, self).setUp()
@@ -416,7 +416,7 @@ class FederatedTokenTests(utils.TestCase):
         self.assertIsNone(self.federated_token.user_domain_id)
 
 
-class ServiceProviderTests(utils.TestCase, utils.CrudTests):
+class ServiceProviderTests(utils.ClientTestCase, utils.CrudTests):
     def setUp(self):
         super(ServiceProviderTests, self).setUp()
         self.key = 'service_provider'
diff --git a/keystoneclient/tests/unit/v3/test_groups.py b/keystoneclient/tests/unit/v3/test_groups.py
index 6ed140cef..90fff0e63 100644
--- a/keystoneclient/tests/unit/v3/test_groups.py
+++ b/keystoneclient/tests/unit/v3/test_groups.py
@@ -18,7 +18,7 @@ from keystoneclient.tests.unit.v3 import utils
 from keystoneclient.v3 import groups
 
 
-class GroupTests(utils.TestCase, utils.CrudTests):
+class GroupTests(utils.ClientTestCase, utils.CrudTests):
     def setUp(self):
         super(GroupTests, self).setUp()
         self.key = 'group'
diff --git a/keystoneclient/tests/unit/v3/test_oauth1.py b/keystoneclient/tests/unit/v3/test_oauth1.py
index a9780c4d1..288760422 100644
--- a/keystoneclient/tests/unit/v3/test_oauth1.py
+++ b/keystoneclient/tests/unit/v3/test_oauth1.py
@@ -33,15 +33,11 @@ except ImportError:
     oauth1 = None
 
 
-class BaseTest(utils.TestCase):
+class ConsumerTests(utils.ClientTestCase, utils.CrudTests):
     def setUp(self):
-        super(BaseTest, self).setUp()
         if oauth1 is None:
             self.skipTest('oauthlib package not available')
 
-
-class ConsumerTests(BaseTest, utils.CrudTests):
-    def setUp(self):
         super(ConsumerTests, self).setUp()
         self.key = 'consumer'
         self.collection_key = 'consumers'
@@ -79,7 +75,7 @@ class ConsumerTests(BaseTest, utils.CrudTests):
         self.assertEqual(consumer_id, consumer.id)
 
 
-class TokenTests(BaseTest):
+class TokenTests(object):
     def _new_oauth_token(self):
         key = uuid.uuid4().hex
         secret = uuid.uuid4().hex
@@ -122,8 +118,11 @@ class TokenTests(BaseTest):
         return parameters
 
 
-class RequestTokenTests(TokenTests):
+class RequestTokenTests(utils.ClientTestCase, TokenTests):
     def setUp(self):
+        if oauth1 is None:
+            self.skipTest('oauthlib package not available')
+
         super(RequestTokenTests, self).setUp()
         self.model = request_tokens.RequestToken
         self.manager = self.client.oauth1.request_tokens
@@ -181,8 +180,11 @@ class RequestTokenTests(TokenTests):
                                      oauth_client)
 
 
-class AccessTokenTests(TokenTests):
+class AccessTokenTests(utils.ClientTestCase, TokenTests):
     def setUp(self):
+        if oauth1 is None:
+            self.skipTest('oauthlib package not available')
+
         super(AccessTokenTests, self).setUp()
         self.manager = self.client.oauth1.access_tokens
         self.model = access_tokens.AccessToken
@@ -223,7 +225,7 @@ class AccessTokenTests(TokenTests):
                                      oauth_client)
 
 
-class AuthenticateWithOAuthTests(TokenTests):
+class AuthenticateWithOAuthTests(utils.TestCase, TokenTests):
     def setUp(self):
         super(AuthenticateWithOAuthTests, self).setUp()
         if oauth1 is None:
diff --git a/keystoneclient/tests/unit/v3/test_policies.py b/keystoneclient/tests/unit/v3/test_policies.py
index a7f8d8afd..47be4838d 100644
--- a/keystoneclient/tests/unit/v3/test_policies.py
+++ b/keystoneclient/tests/unit/v3/test_policies.py
@@ -16,7 +16,7 @@ from keystoneclient.tests.unit.v3 import utils
 from keystoneclient.v3 import policies
 
 
-class PolicyTests(utils.TestCase, utils.CrudTests):
+class PolicyTests(utils.ClientTestCase, utils.CrudTests):
     def setUp(self):
         super(PolicyTests, self).setUp()
         self.key = 'policy'
diff --git a/keystoneclient/tests/unit/v3/test_projects.py b/keystoneclient/tests/unit/v3/test_projects.py
index 61a5ef17b..6edf4c64f 100644
--- a/keystoneclient/tests/unit/v3/test_projects.py
+++ b/keystoneclient/tests/unit/v3/test_projects.py
@@ -17,7 +17,7 @@ from keystoneclient.tests.unit.v3 import utils
 from keystoneclient.v3 import projects
 
 
-class ProjectTests(utils.TestCase, utils.CrudTests):
+class ProjectTests(utils.ClientTestCase, utils.CrudTests):
     def setUp(self):
         super(ProjectTests, self).setUp()
         self.key = 'project'
diff --git a/keystoneclient/tests/unit/v3/test_regions.py b/keystoneclient/tests/unit/v3/test_regions.py
index 392f79f97..90ddfdc64 100644
--- a/keystoneclient/tests/unit/v3/test_regions.py
+++ b/keystoneclient/tests/unit/v3/test_regions.py
@@ -18,7 +18,7 @@ from keystoneclient.tests.unit.v3 import utils
 from keystoneclient.v3 import regions
 
 
-class RegionTests(utils.TestCase, utils.CrudTests):
+class RegionTests(utils.ClientTestCase, utils.CrudTests):
     def setUp(self):
         super(RegionTests, self).setUp()
         self.key = 'region'
diff --git a/keystoneclient/tests/unit/v3/test_role_assignments.py b/keystoneclient/tests/unit/v3/test_role_assignments.py
index 21fc2c322..b955dfad6 100644
--- a/keystoneclient/tests/unit/v3/test_role_assignments.py
+++ b/keystoneclient/tests/unit/v3/test_role_assignments.py
@@ -15,7 +15,7 @@ from keystoneclient.tests.unit.v3 import utils
 from keystoneclient.v3 import role_assignments
 
 
-class RoleAssignmentsTests(utils.TestCase, utils.CrudTests):
+class RoleAssignmentsTests(utils.ClientTestCase, utils.CrudTests):
 
     def setUp(self):
         super(RoleAssignmentsTests, self).setUp()
diff --git a/keystoneclient/tests/unit/v3/test_roles.py b/keystoneclient/tests/unit/v3/test_roles.py
index bb76e9ba0..9606ede38 100644
--- a/keystoneclient/tests/unit/v3/test_roles.py
+++ b/keystoneclient/tests/unit/v3/test_roles.py
@@ -20,7 +20,7 @@ from keystoneclient.v3 import roles
 from testtools import matchers
 
 
-class RoleTests(utils.TestCase, utils.CrudTests):
+class RoleTests(utils.ClientTestCase, utils.CrudTests):
     def setUp(self):
         super(RoleTests, self).setUp()
         self.key = 'role'
diff --git a/keystoneclient/tests/unit/v3/test_services.py b/keystoneclient/tests/unit/v3/test_services.py
index 40dde475b..9bda5dbb5 100644
--- a/keystoneclient/tests/unit/v3/test_services.py
+++ b/keystoneclient/tests/unit/v3/test_services.py
@@ -16,7 +16,7 @@ from keystoneclient.tests.unit.v3 import utils
 from keystoneclient.v3 import services
 
 
-class ServiceTests(utils.TestCase, utils.CrudTests):
+class ServiceTests(utils.ClientTestCase, utils.CrudTests):
     def setUp(self):
         super(ServiceTests, self).setUp()
         self.key = 'service'
diff --git a/keystoneclient/tests/unit/v3/test_simple_cert.py b/keystoneclient/tests/unit/v3/test_simple_cert.py
index 067083a44..1c4a245d2 100644
--- a/keystoneclient/tests/unit/v3/test_simple_cert.py
+++ b/keystoneclient/tests/unit/v3/test_simple_cert.py
@@ -17,7 +17,7 @@ from keystoneclient.tests.unit import client_fixtures
 from keystoneclient.tests.unit.v3 import utils
 
 
-class SimpleCertTests(utils.TestCase, testresources.ResourcedTestCase):
+class SimpleCertTests(utils.ClientTestCase, testresources.ResourcedTestCase):
 
     resources = [('examples', client_fixtures.EXAMPLES_RESOURCE)]
 
diff --git a/keystoneclient/tests/unit/v3/test_tokens.py b/keystoneclient/tests/unit/v3/test_tokens.py
index 0363a61fe..1234da902 100644
--- a/keystoneclient/tests/unit/v3/test_tokens.py
+++ b/keystoneclient/tests/unit/v3/test_tokens.py
@@ -20,7 +20,7 @@ from keystoneclient.tests.unit import client_fixtures
 from keystoneclient.tests.unit.v3 import utils
 
 
-class TokenTests(utils.TestCase, testresources.ResourcedTestCase):
+class TokenTests(utils.ClientTestCase, testresources.ResourcedTestCase):
 
     resources = [('examples', client_fixtures.EXAMPLES_RESOURCE)]
 
diff --git a/keystoneclient/tests/unit/v3/test_trusts.py b/keystoneclient/tests/unit/v3/test_trusts.py
index fbd8fdead..72fb5b764 100644
--- a/keystoneclient/tests/unit/v3/test_trusts.py
+++ b/keystoneclient/tests/unit/v3/test_trusts.py
@@ -20,7 +20,7 @@ from keystoneclient.tests.unit.v3 import utils
 from keystoneclient.v3.contrib import trusts
 
 
-class TrustTests(utils.TestCase, utils.CrudTests):
+class TrustTests(utils.ClientTestCase, utils.CrudTests):
     def setUp(self):
         super(TrustTests, self).setUp()
         self.key = 'trust'
diff --git a/keystoneclient/tests/unit/v3/test_users.py b/keystoneclient/tests/unit/v3/test_users.py
index ccb3b002c..e0a34461e 100644
--- a/keystoneclient/tests/unit/v3/test_users.py
+++ b/keystoneclient/tests/unit/v3/test_users.py
@@ -20,7 +20,7 @@ from keystoneclient.tests.unit.v3 import utils
 from keystoneclient.v3 import users
 
 
-class UserTests(utils.TestCase, utils.CrudTests):
+class UserTests(utils.ClientTestCase, utils.CrudTests):
     def setUp(self):
         super(UserTests, self).setUp()
         self.key = 'user'
diff --git a/keystoneclient/tests/unit/v3/utils.py b/keystoneclient/tests/unit/v3/utils.py
index 1705e9d7a..5373e59a8 100644
--- a/keystoneclient/tests/unit/v3/utils.py
+++ b/keystoneclient/tests/unit/v3/utils.py
@@ -127,15 +127,6 @@ class TestCase(UnauthenticatedTestCase):
         "type": "object-store"
     }]
 
-    def setUp(self):
-        super(TestCase, self).setUp()
-
-        # Creating a Client not using session is deprecated.
-        with self.deprecations.expect_deprecations_here():
-            self.client = client.Client(token=self.TEST_TOKEN,
-                                        auth_url=self.TEST_URL,
-                                        endpoint=self.TEST_URL)
-
     def stub_auth(self, subject_token=None, **kwargs):
         if not subject_token:
             subject_token = self.TEST_TOKEN
@@ -153,6 +144,18 @@ class TestCase(UnauthenticatedTestCase):
         self.stub_url('POST', ['auth', 'tokens'], **kwargs)
 
 
+class ClientTestCase(TestCase):
+
+    def setUp(self):
+        super(TestCase, self).setUp()
+
+        # Creating a Client not using session is deprecated.
+        with self.deprecations.expect_deprecations_here():
+            self.client = client.Client(token=self.TEST_TOKEN,
+                                        auth_url=self.TEST_URL,
+                                        endpoint=self.TEST_URL)
+
+
 class CrudTests(object):
     key = None
     collection_key = None