From 6bd93179a2966f2b5c67e297628510ac73689fb3 Mon Sep 17 00:00:00 2001
From: Jamie Lennox <jamielennox@redhat.com>
Date: Wed, 11 Feb 2015 19:03:25 +1100
Subject: [PATCH] Move tests to the unit subdirectory

Move all the existing tests to the unit/ subdirectory. This gives us
some room to add a functional/ directory later with other tests.

Change-Id: I0fb8d5b628eb8ee1f35f05f42d0c0ac9f285e8c3
Implements: functional-testing
---
 keystoneclient/tests/{apiclient => unit}/__init__.py        | 0
 keystoneclient/tests/{auth => unit/apiclient}/__init__.py   | 0
 .../tests/{ => unit}/apiclient/test_exceptions.py           | 2 +-
 keystoneclient/tests/{generic => unit/auth}/__init__.py     | 0
 keystoneclient/tests/{ => unit}/auth/test_access.py         | 2 +-
 keystoneclient/tests/{ => unit}/auth/test_cli.py            | 2 +-
 keystoneclient/tests/{ => unit}/auth/test_conf.py           | 2 +-
 .../tests/{ => unit}/auth/test_identity_common.py           | 2 +-
 keystoneclient/tests/{ => unit}/auth/test_identity_v2.py    | 2 +-
 keystoneclient/tests/{ => unit}/auth/test_identity_v3.py    | 2 +-
 keystoneclient/tests/{ => unit}/auth/test_password.py       | 2 +-
 keystoneclient/tests/{ => unit}/auth/test_token.py          | 2 +-
 keystoneclient/tests/{ => unit}/auth/test_token_endpoint.py | 2 +-
 keystoneclient/tests/{ => unit}/auth/utils.py               | 2 +-
 keystoneclient/tests/{ => unit}/client_fixtures.py          | 2 +-
 keystoneclient/tests/{v2_0 => unit/generic}/__init__.py     | 0
 keystoneclient/tests/{ => unit}/generic/test_client.py      | 2 +-
 keystoneclient/tests/{ => unit}/generic/test_shell.py       | 2 +-
 .../tests/{ => unit}/test_auth_token_middleware.py          | 4 ++--
 keystoneclient/tests/{ => unit}/test_base.py                | 2 +-
 keystoneclient/tests/{ => unit}/test_cms.py                 | 4 ++--
 keystoneclient/tests/{ => unit}/test_discovery.py           | 2 +-
 keystoneclient/tests/{ => unit}/test_ec2utils.py            | 0
 keystoneclient/tests/{ => unit}/test_fixtures.py            | 2 +-
 keystoneclient/tests/{ => unit}/test_hacking_checks.py      | 2 +-
 keystoneclient/tests/{ => unit}/test_http.py                | 2 +-
 keystoneclient/tests/{ => unit}/test_https.py               | 2 +-
 keystoneclient/tests/{ => unit}/test_keyring.py             | 4 ++--
 keystoneclient/tests/{ => unit}/test_memcache_crypt.py      | 0
 keystoneclient/tests/{ => unit}/test_s3_token_middleware.py | 2 +-
 keystoneclient/tests/{ => unit}/test_session.py             | 2 +-
 keystoneclient/tests/{ => unit}/test_shell.py               | 2 +-
 keystoneclient/tests/{ => unit}/test_utils.py               | 4 ++--
 keystoneclient/tests/{ => unit}/utils.py                    | 0
 keystoneclient/tests/{v3 => unit/v2_0}/__init__.py          | 0
 keystoneclient/tests/{ => unit}/v2_0/client_fixtures.py     | 0
 keystoneclient/tests/{ => unit}/v2_0/test_access.py         | 6 +++---
 keystoneclient/tests/{ => unit}/v2_0/test_auth.py           | 2 +-
 keystoneclient/tests/{ => unit}/v2_0/test_certificates.py   | 4 ++--
 keystoneclient/tests/{ => unit}/v2_0/test_client.py         | 4 ++--
 keystoneclient/tests/{ => unit}/v2_0/test_discovery.py      | 2 +-
 keystoneclient/tests/{ => unit}/v2_0/test_ec2.py            | 2 +-
 keystoneclient/tests/{ => unit}/v2_0/test_endpoints.py      | 2 +-
 keystoneclient/tests/{ => unit}/v2_0/test_extensions.py     | 2 +-
 keystoneclient/tests/{ => unit}/v2_0/test_roles.py          | 2 +-
 .../tests/{ => unit}/v2_0/test_service_catalog.py           | 4 ++--
 keystoneclient/tests/{ => unit}/v2_0/test_services.py       | 2 +-
 keystoneclient/tests/{ => unit}/v2_0/test_shell.py          | 2 +-
 keystoneclient/tests/{ => unit}/v2_0/test_tenants.py        | 2 +-
 keystoneclient/tests/{ => unit}/v2_0/test_tokens.py         | 2 +-
 keystoneclient/tests/{ => unit}/v2_0/test_users.py          | 2 +-
 keystoneclient/tests/{ => unit}/v2_0/utils.py               | 2 +-
 keystoneclient/tests/unit/v3/__init__.py                    | 0
 keystoneclient/tests/{ => unit}/v3/client_fixtures.py       | 0
 .../v3/examples/xml/ADFS_RequestSecurityTokenResponse.xml   | 0
 .../tests/{ => unit}/v3/examples/xml/ADFS_fault.xml         | 0
 keystoneclient/tests/{ => unit}/v3/saml2_fixtures.py        | 0
 keystoneclient/tests/{ => unit}/v3/test_access.py           | 4 ++--
 keystoneclient/tests/{ => unit}/v3/test_auth.py             | 2 +-
 keystoneclient/tests/{ => unit}/v3/test_auth_saml2.py       | 6 +++---
 keystoneclient/tests/{ => unit}/v3/test_client.py           | 4 ++--
 keystoneclient/tests/{ => unit}/v3/test_credentials.py      | 2 +-
 keystoneclient/tests/{ => unit}/v3/test_discover.py         | 2 +-
 keystoneclient/tests/{ => unit}/v3/test_domains.py          | 2 +-
 keystoneclient/tests/{ => unit}/v3/test_endpoint_filter.py  | 2 +-
 keystoneclient/tests/{ => unit}/v3/test_endpoint_policy.py  | 4 ++--
 keystoneclient/tests/{ => unit}/v3/test_endpoints.py        | 2 +-
 keystoneclient/tests/{ => unit}/v3/test_federation.py       | 2 +-
 keystoneclient/tests/{ => unit}/v3/test_groups.py           | 2 +-
 keystoneclient/tests/{ => unit}/v3/test_oauth1.py           | 4 ++--
 keystoneclient/tests/{ => unit}/v3/test_policies.py         | 2 +-
 keystoneclient/tests/{ => unit}/v3/test_projects.py         | 2 +-
 keystoneclient/tests/{ => unit}/v3/test_regions.py          | 2 +-
 keystoneclient/tests/{ => unit}/v3/test_role_assignments.py | 2 +-
 keystoneclient/tests/{ => unit}/v3/test_roles.py            | 2 +-
 keystoneclient/tests/{ => unit}/v3/test_service_catalog.py  | 4 ++--
 keystoneclient/tests/{ => unit}/v3/test_services.py         | 2 +-
 keystoneclient/tests/{ => unit}/v3/test_tokens.py           | 4 ++--
 keystoneclient/tests/{ => unit}/v3/test_trusts.py           | 2 +-
 keystoneclient/tests/{ => unit}/v3/test_users.py            | 2 +-
 keystoneclient/tests/{ => unit}/v3/utils.py                 | 2 +-
 81 files changed, 84 insertions(+), 84 deletions(-)
 rename keystoneclient/tests/{apiclient => unit}/__init__.py (100%)
 rename keystoneclient/tests/{auth => unit/apiclient}/__init__.py (100%)
 rename keystoneclient/tests/{ => unit}/apiclient/test_exceptions.py (98%)
 rename keystoneclient/tests/{generic => unit/auth}/__init__.py (100%)
 rename keystoneclient/tests/{ => unit}/auth/test_access.py (98%)
 rename keystoneclient/tests/{ => unit}/auth/test_cli.py (99%)
 rename keystoneclient/tests/{ => unit}/auth/test_conf.py (99%)
 rename keystoneclient/tests/{ => unit}/auth/test_identity_common.py (99%)
 rename keystoneclient/tests/{ => unit}/auth/test_identity_v2.py (99%)
 rename keystoneclient/tests/{ => unit}/auth/test_identity_v3.py (99%)
 rename keystoneclient/tests/{ => unit}/auth/test_password.py (97%)
 rename keystoneclient/tests/{ => unit}/auth/test_token.py (97%)
 rename keystoneclient/tests/{ => unit}/auth/test_token_endpoint.py (98%)
 rename keystoneclient/tests/{ => unit}/auth/utils.py (99%)
 rename keystoneclient/tests/{ => unit}/client_fixtures.py (99%)
 rename keystoneclient/tests/{v2_0 => unit/generic}/__init__.py (100%)
 rename keystoneclient/tests/{ => unit}/generic/test_client.py (98%)
 rename keystoneclient/tests/{ => unit}/generic/test_shell.py (99%)
 rename keystoneclient/tests/{ => unit}/test_auth_token_middleware.py (99%)
 rename keystoneclient/tests/{ => unit}/test_base.py (99%)
 rename keystoneclient/tests/{ => unit}/test_cms.py (98%)
 rename keystoneclient/tests/{ => unit}/test_discovery.py (99%)
 rename keystoneclient/tests/{ => unit}/test_ec2utils.py (100%)
 rename keystoneclient/tests/{ => unit}/test_fixtures.py (99%)
 rename keystoneclient/tests/{ => unit}/test_hacking_checks.py (96%)
 rename keystoneclient/tests/{ => unit}/test_http.py (99%)
 rename keystoneclient/tests/{ => unit}/test_https.py (98%)
 rename keystoneclient/tests/{ => unit}/test_keyring.py (98%)
 rename keystoneclient/tests/{ => unit}/test_memcache_crypt.py (100%)
 rename keystoneclient/tests/{ => unit}/test_s3_token_middleware.py (99%)
 rename keystoneclient/tests/{ => unit}/test_session.py (99%)
 rename keystoneclient/tests/{ => unit}/test_shell.py (99%)
 rename keystoneclient/tests/{ => unit}/test_utils.py (98%)
 rename keystoneclient/tests/{ => unit}/utils.py (100%)
 rename keystoneclient/tests/{v3 => unit/v2_0}/__init__.py (100%)
 rename keystoneclient/tests/{ => unit}/v2_0/client_fixtures.py (100%)
 rename keystoneclient/tests/{ => unit}/v2_0/test_access.py (97%)
 rename keystoneclient/tests/{ => unit}/v2_0/test_auth.py (99%)
 rename keystoneclient/tests/{ => unit}/v2_0/test_certificates.py (93%)
 rename keystoneclient/tests/{ => unit}/v2_0/test_client.py (98%)
 rename keystoneclient/tests/{ => unit}/v2_0/test_discovery.py (98%)
 rename keystoneclient/tests/{ => unit}/v2_0/test_ec2.py (98%)
 rename keystoneclient/tests/{ => unit}/v2_0/test_endpoints.py (99%)
 rename keystoneclient/tests/{ => unit}/v2_0/test_extensions.py (98%)
 rename keystoneclient/tests/{ => unit}/v2_0/test_roles.py (98%)
 rename keystoneclient/tests/{ => unit}/v2_0/test_service_catalog.py (98%)
 rename keystoneclient/tests/{ => unit}/v2_0/test_services.py (98%)
 rename keystoneclient/tests/{ => unit}/v2_0/test_shell.py (99%)
 rename keystoneclient/tests/{ => unit}/v2_0/test_tenants.py (99%)
 rename keystoneclient/tests/{ => unit}/v2_0/test_tokens.py (99%)
 rename keystoneclient/tests/{ => unit}/v2_0/test_users.py (99%)
 rename keystoneclient/tests/{ => unit}/v2_0/utils.py (98%)
 create mode 100644 keystoneclient/tests/unit/v3/__init__.py
 rename keystoneclient/tests/{ => unit}/v3/client_fixtures.py (100%)
 rename keystoneclient/tests/{ => unit}/v3/examples/xml/ADFS_RequestSecurityTokenResponse.xml (100%)
 rename keystoneclient/tests/{ => unit}/v3/examples/xml/ADFS_fault.xml (100%)
 rename keystoneclient/tests/{ => unit}/v3/saml2_fixtures.py (100%)
 rename keystoneclient/tests/{ => unit}/v3/test_access.py (98%)
 rename keystoneclient/tests/{ => unit}/v3/test_auth.py (99%)
 rename keystoneclient/tests/{ => unit}/v3/test_auth_saml2.py (99%)
 rename keystoneclient/tests/{ => unit}/v3/test_client.py (98%)
 rename keystoneclient/tests/{ => unit}/v3/test_credentials.py (97%)
 rename keystoneclient/tests/{ => unit}/v3/test_discover.py (98%)
 rename keystoneclient/tests/{ => unit}/v3/test_domains.py (97%)
 rename keystoneclient/tests/{ => unit}/v3/test_endpoint_filter.py (99%)
 rename keystoneclient/tests/{ => unit}/v3/test_endpoint_policy.py (98%)
 rename keystoneclient/tests/{ => unit}/v3/test_endpoints.py (98%)
 rename keystoneclient/tests/{ => unit}/v3/test_federation.py (99%)
 rename keystoneclient/tests/{ => unit}/v3/test_groups.py (97%)
 rename keystoneclient/tests/{ => unit}/v3/test_oauth1.py (99%)
 rename keystoneclient/tests/{ => unit}/v3/test_policies.py (95%)
 rename keystoneclient/tests/{ => unit}/v3/test_projects.py (99%)
 rename keystoneclient/tests/{ => unit}/v3/test_regions.py (96%)
 rename keystoneclient/tests/{ => unit}/v3/test_role_assignments.py (99%)
 rename keystoneclient/tests/{ => unit}/v3/test_roles.py (99%)
 rename keystoneclient/tests/{ => unit}/v3/test_service_catalog.py (98%)
 rename keystoneclient/tests/{ => unit}/v3/test_services.py (97%)
 rename keystoneclient/tests/{ => unit}/v3/test_tokens.py (97%)
 rename keystoneclient/tests/{ => unit}/v3/test_trusts.py (98%)
 rename keystoneclient/tests/{ => unit}/v3/test_users.py (99%)
 rename keystoneclient/tests/{ => unit}/v3/utils.py (99%)

diff --git a/keystoneclient/tests/apiclient/__init__.py b/keystoneclient/tests/unit/__init__.py
similarity index 100%
rename from keystoneclient/tests/apiclient/__init__.py
rename to keystoneclient/tests/unit/__init__.py
diff --git a/keystoneclient/tests/auth/__init__.py b/keystoneclient/tests/unit/apiclient/__init__.py
similarity index 100%
rename from keystoneclient/tests/auth/__init__.py
rename to keystoneclient/tests/unit/apiclient/__init__.py
diff --git a/keystoneclient/tests/apiclient/test_exceptions.py b/keystoneclient/tests/unit/apiclient/test_exceptions.py
similarity index 98%
rename from keystoneclient/tests/apiclient/test_exceptions.py
rename to keystoneclient/tests/unit/apiclient/test_exceptions.py
index 1f1b1b2f0..4a803c7e7 100644
--- a/keystoneclient/tests/apiclient/test_exceptions.py
+++ b/keystoneclient/tests/unit/apiclient/test_exceptions.py
@@ -16,7 +16,7 @@
 import six
 
 from keystoneclient import exceptions
-from keystoneclient.tests import utils
+from keystoneclient.tests.unit import utils
 
 
 class FakeResponse(object):
diff --git a/keystoneclient/tests/generic/__init__.py b/keystoneclient/tests/unit/auth/__init__.py
similarity index 100%
rename from keystoneclient/tests/generic/__init__.py
rename to keystoneclient/tests/unit/auth/__init__.py
diff --git a/keystoneclient/tests/auth/test_access.py b/keystoneclient/tests/unit/auth/test_access.py
similarity index 98%
rename from keystoneclient/tests/auth/test_access.py
rename to keystoneclient/tests/unit/auth/test_access.py
index 04960cb8d..405fb8bef 100644
--- a/keystoneclient/tests/auth/test_access.py
+++ b/keystoneclient/tests/unit/auth/test_access.py
@@ -17,7 +17,7 @@ from keystoneclient import auth
 from keystoneclient.auth.identity import access as access_plugin
 from keystoneclient import fixture
 from keystoneclient import session
-from keystoneclient.tests import utils
+from keystoneclient.tests.unit import utils
 
 
 class AccessInfoPluginTests(utils.TestCase):
diff --git a/keystoneclient/tests/auth/test_cli.py b/keystoneclient/tests/unit/auth/test_cli.py
similarity index 99%
rename from keystoneclient/tests/auth/test_cli.py
rename to keystoneclient/tests/unit/auth/test_cli.py
index f2204ee7c..d65de731f 100644
--- a/keystoneclient/tests/auth/test_cli.py
+++ b/keystoneclient/tests/unit/auth/test_cli.py
@@ -19,7 +19,7 @@ from oslo_config import cfg
 
 from keystoneclient.auth import base
 from keystoneclient.auth import cli
-from keystoneclient.tests.auth import utils
+from keystoneclient.tests.unit.auth import utils
 
 
 class TesterPlugin(base.BaseAuthPlugin):
diff --git a/keystoneclient/tests/auth/test_conf.py b/keystoneclient/tests/unit/auth/test_conf.py
similarity index 99%
rename from keystoneclient/tests/auth/test_conf.py
rename to keystoneclient/tests/unit/auth/test_conf.py
index c8c9ece2b..c3ce8eb69 100644
--- a/keystoneclient/tests/auth/test_conf.py
+++ b/keystoneclient/tests/unit/auth/test_conf.py
@@ -22,7 +22,7 @@ from keystoneclient.auth import conf
 from keystoneclient.auth.identity import v2 as v2_auth
 from keystoneclient.auth.identity import v3 as v3_auth
 from keystoneclient import exceptions
-from keystoneclient.tests.auth import utils
+from keystoneclient.tests.unit.auth import utils
 
 
 class ConfTests(utils.TestCase):
diff --git a/keystoneclient/tests/auth/test_identity_common.py b/keystoneclient/tests/unit/auth/test_identity_common.py
similarity index 99%
rename from keystoneclient/tests/auth/test_identity_common.py
rename to keystoneclient/tests/unit/auth/test_identity_common.py
index e5b2528e7..db30beaf5 100644
--- a/keystoneclient/tests/auth/test_identity_common.py
+++ b/keystoneclient/tests/unit/auth/test_identity_common.py
@@ -22,7 +22,7 @@ from keystoneclient.auth import base
 from keystoneclient.auth import identity
 from keystoneclient import fixture
 from keystoneclient import session
-from keystoneclient.tests import utils
+from keystoneclient.tests.unit import utils
 
 
 @six.add_metaclass(abc.ABCMeta)
diff --git a/keystoneclient/tests/auth/test_identity_v2.py b/keystoneclient/tests/unit/auth/test_identity_v2.py
similarity index 99%
rename from keystoneclient/tests/auth/test_identity_v2.py
rename to keystoneclient/tests/unit/auth/test_identity_v2.py
index 345f0bd4d..6d432a750 100644
--- a/keystoneclient/tests/auth/test_identity_v2.py
+++ b/keystoneclient/tests/unit/auth/test_identity_v2.py
@@ -16,7 +16,7 @@ import uuid
 from keystoneclient.auth.identity import v2
 from keystoneclient import exceptions
 from keystoneclient import session
-from keystoneclient.tests import utils
+from keystoneclient.tests.unit import utils
 
 
 class V2IdentityPlugin(utils.TestCase):
diff --git a/keystoneclient/tests/auth/test_identity_v3.py b/keystoneclient/tests/unit/auth/test_identity_v3.py
similarity index 99%
rename from keystoneclient/tests/auth/test_identity_v3.py
rename to keystoneclient/tests/unit/auth/test_identity_v3.py
index f1c735784..29cbb0e5a 100644
--- a/keystoneclient/tests/auth/test_identity_v3.py
+++ b/keystoneclient/tests/unit/auth/test_identity_v3.py
@@ -19,7 +19,7 @@ from keystoneclient import client
 from keystoneclient import exceptions
 from keystoneclient import fixture
 from keystoneclient import session
-from keystoneclient.tests import utils
+from keystoneclient.tests.unit import utils
 
 
 class V3IdentityPlugin(utils.TestCase):
diff --git a/keystoneclient/tests/auth/test_password.py b/keystoneclient/tests/unit/auth/test_password.py
similarity index 97%
rename from keystoneclient/tests/auth/test_password.py
rename to keystoneclient/tests/unit/auth/test_password.py
index 8238d59c3..c5067c09c 100644
--- a/keystoneclient/tests/auth/test_password.py
+++ b/keystoneclient/tests/unit/auth/test_password.py
@@ -15,7 +15,7 @@ import uuid
 from keystoneclient.auth.identity.generic import password
 from keystoneclient.auth.identity import v2
 from keystoneclient.auth.identity import v3
-from keystoneclient.tests.auth import utils
+from keystoneclient.tests.unit.auth import utils
 
 
 class PasswordTests(utils.GenericPluginTestCase):
diff --git a/keystoneclient/tests/auth/test_token.py b/keystoneclient/tests/unit/auth/test_token.py
similarity index 97%
rename from keystoneclient/tests/auth/test_token.py
rename to keystoneclient/tests/unit/auth/test_token.py
index 9f0cc3c7f..928e2b219 100644
--- a/keystoneclient/tests/auth/test_token.py
+++ b/keystoneclient/tests/unit/auth/test_token.py
@@ -15,7 +15,7 @@ import uuid
 from keystoneclient.auth.identity.generic import token
 from keystoneclient.auth.identity import v2
 from keystoneclient.auth.identity import v3
-from keystoneclient.tests.auth import utils
+from keystoneclient.tests.unit.auth import utils
 
 
 class TokenTests(utils.GenericPluginTestCase):
diff --git a/keystoneclient/tests/auth/test_token_endpoint.py b/keystoneclient/tests/unit/auth/test_token_endpoint.py
similarity index 98%
rename from keystoneclient/tests/auth/test_token_endpoint.py
rename to keystoneclient/tests/unit/auth/test_token_endpoint.py
index fa64b3944..4b5f82cfc 100644
--- a/keystoneclient/tests/auth/test_token_endpoint.py
+++ b/keystoneclient/tests/unit/auth/test_token_endpoint.py
@@ -14,7 +14,7 @@ from testtools import matchers
 
 from keystoneclient.auth import token_endpoint
 from keystoneclient import session
-from keystoneclient.tests import utils
+from keystoneclient.tests.unit import utils
 
 
 class TokenEndpointTest(utils.TestCase):
diff --git a/keystoneclient/tests/auth/utils.py b/keystoneclient/tests/unit/auth/utils.py
similarity index 99%
rename from keystoneclient/tests/auth/utils.py
rename to keystoneclient/tests/unit/auth/utils.py
index 31ed6e107..6580c7366 100644
--- a/keystoneclient/tests/auth/utils.py
+++ b/keystoneclient/tests/unit/auth/utils.py
@@ -22,7 +22,7 @@ from keystoneclient.auth import base
 from keystoneclient import exceptions
 from keystoneclient import fixture
 from keystoneclient import session
-from keystoneclient.tests import utils
+from keystoneclient.tests.unit import utils
 
 
 class MockPlugin(base.BaseAuthPlugin):
diff --git a/keystoneclient/tests/client_fixtures.py b/keystoneclient/tests/unit/client_fixtures.py
similarity index 99%
rename from keystoneclient/tests/client_fixtures.py
rename to keystoneclient/tests/unit/client_fixtures.py
index e97140f4b..b226e32bb 100644
--- a/keystoneclient/tests/client_fixtures.py
+++ b/keystoneclient/tests/unit/client_fixtures.py
@@ -25,7 +25,7 @@ from keystoneclient import utils
 
 
 TESTDIR = os.path.dirname(os.path.abspath(__file__))
-ROOTDIR = os.path.normpath(os.path.join(TESTDIR, '..', '..'))
+ROOTDIR = os.path.normpath(os.path.join(TESTDIR, '..', '..', '..'))
 CERTDIR = os.path.join(ROOTDIR, 'examples', 'pki', 'certs')
 CMSDIR = os.path.join(ROOTDIR, 'examples', 'pki', 'cms')
 KEYDIR = os.path.join(ROOTDIR, 'examples', 'pki', 'private')
diff --git a/keystoneclient/tests/v2_0/__init__.py b/keystoneclient/tests/unit/generic/__init__.py
similarity index 100%
rename from keystoneclient/tests/v2_0/__init__.py
rename to keystoneclient/tests/unit/generic/__init__.py
diff --git a/keystoneclient/tests/generic/test_client.py b/keystoneclient/tests/unit/generic/test_client.py
similarity index 98%
rename from keystoneclient/tests/generic/test_client.py
rename to keystoneclient/tests/unit/generic/test_client.py
index 6100f0a1c..e56e3dfc3 100644
--- a/keystoneclient/tests/generic/test_client.py
+++ b/keystoneclient/tests/unit/generic/test_client.py
@@ -16,7 +16,7 @@
 from oslo_serialization import jsonutils
 
 from keystoneclient.generic import client
-from keystoneclient.tests import utils
+from keystoneclient.tests.unit import utils
 
 BASE_HOST = 'http://keystone.example.com'
 BASE_URL = "%s:5000/" % BASE_HOST
diff --git a/keystoneclient/tests/generic/test_shell.py b/keystoneclient/tests/unit/generic/test_shell.py
similarity index 99%
rename from keystoneclient/tests/generic/test_shell.py
rename to keystoneclient/tests/unit/generic/test_shell.py
index 194c5b2d9..ad457aad3 100644
--- a/keystoneclient/tests/generic/test_shell.py
+++ b/keystoneclient/tests/unit/generic/test_shell.py
@@ -17,7 +17,7 @@ import mock
 from six import moves
 
 from keystoneclient.generic import shell
-from keystoneclient.tests import utils
+from keystoneclient.tests.unit import utils
 
 
 class DoDiscoverTest(utils.TestCase):
diff --git a/keystoneclient/tests/test_auth_token_middleware.py b/keystoneclient/tests/unit/test_auth_token_middleware.py
similarity index 99%
rename from keystoneclient/tests/test_auth_token_middleware.py
rename to keystoneclient/tests/unit/test_auth_token_middleware.py
index 9e0bad186..f3b523d20 100644
--- a/keystoneclient/tests/test_auth_token_middleware.py
+++ b/keystoneclient/tests/unit/test_auth_token_middleware.py
@@ -41,8 +41,8 @@ from keystoneclient import exceptions
 from keystoneclient import fixture
 from keystoneclient.middleware import auth_token
 from keystoneclient.openstack.common import memorycache
-from keystoneclient.tests import client_fixtures
-from keystoneclient.tests import utils
+from keystoneclient.tests.unit import client_fixtures
+from keystoneclient.tests.unit import utils
 
 
 EXPECTED_V2_DEFAULT_ENV_RESPONSE = {
diff --git a/keystoneclient/tests/test_base.py b/keystoneclient/tests/unit/test_base.py
similarity index 99%
rename from keystoneclient/tests/test_base.py
rename to keystoneclient/tests/unit/test_base.py
index 52435b8e0..2e7fc5e28 100644
--- a/keystoneclient/tests/test_base.py
+++ b/keystoneclient/tests/unit/test_base.py
@@ -11,7 +11,7 @@
 #    under the License.
 
 from keystoneclient import base
-from keystoneclient.tests import utils
+from keystoneclient.tests.unit import utils
 from keystoneclient.v2_0 import client
 from keystoneclient.v2_0 import roles
 
diff --git a/keystoneclient/tests/test_cms.py b/keystoneclient/tests/unit/test_cms.py
similarity index 98%
rename from keystoneclient/tests/test_cms.py
rename to keystoneclient/tests/unit/test_cms.py
index 9af3bd4fc..019730d6b 100644
--- a/keystoneclient/tests/test_cms.py
+++ b/keystoneclient/tests/unit/test_cms.py
@@ -20,8 +20,8 @@ from testtools import matchers
 
 from keystoneclient.common import cms
 from keystoneclient import exceptions
-from keystoneclient.tests import client_fixtures
-from keystoneclient.tests import utils
+from keystoneclient.tests.unit import client_fixtures
+from keystoneclient.tests.unit import utils
 
 
 class CMSTest(utils.TestCase, testresources.ResourcedTestCase):
diff --git a/keystoneclient/tests/test_discovery.py b/keystoneclient/tests/unit/test_discovery.py
similarity index 99%
rename from keystoneclient/tests/test_discovery.py
rename to keystoneclient/tests/unit/test_discovery.py
index 9587f4b97..6c208a3cb 100644
--- a/keystoneclient/tests/test_discovery.py
+++ b/keystoneclient/tests/unit/test_discovery.py
@@ -24,7 +24,7 @@ from keystoneclient import discover
 from keystoneclient import exceptions
 from keystoneclient import fixture
 from keystoneclient import session
-from keystoneclient.tests import utils
+from keystoneclient.tests.unit import utils
 from keystoneclient.v2_0 import client as v2_client
 from keystoneclient.v3 import client as v3_client
 
diff --git a/keystoneclient/tests/test_ec2utils.py b/keystoneclient/tests/unit/test_ec2utils.py
similarity index 100%
rename from keystoneclient/tests/test_ec2utils.py
rename to keystoneclient/tests/unit/test_ec2utils.py
diff --git a/keystoneclient/tests/test_fixtures.py b/keystoneclient/tests/unit/test_fixtures.py
similarity index 99%
rename from keystoneclient/tests/test_fixtures.py
rename to keystoneclient/tests/unit/test_fixtures.py
index 558d4546d..8080c8238 100644
--- a/keystoneclient/tests/test_fixtures.py
+++ b/keystoneclient/tests/unit/test_fixtures.py
@@ -15,7 +15,7 @@ import uuid
 import six
 
 from keystoneclient import fixture
-from keystoneclient.tests import utils
+from keystoneclient.tests.unit import utils
 
 
 class V2TokenTests(utils.TestCase):
diff --git a/keystoneclient/tests/test_hacking_checks.py b/keystoneclient/tests/unit/test_hacking_checks.py
similarity index 96%
rename from keystoneclient/tests/test_hacking_checks.py
rename to keystoneclient/tests/unit/test_hacking_checks.py
index 84095f38e..220d258cc 100644
--- a/keystoneclient/tests/test_hacking_checks.py
+++ b/keystoneclient/tests/unit/test_hacking_checks.py
@@ -17,7 +17,7 @@ import pep8
 import testtools
 
 from keystoneclient.hacking import checks
-from keystoneclient.tests import client_fixtures
+from keystoneclient.tests.unit import client_fixtures
 
 
 class TestCheckOsloNamespaceImports(testtools.TestCase):
diff --git a/keystoneclient/tests/test_http.py b/keystoneclient/tests/unit/test_http.py
similarity index 99%
rename from keystoneclient/tests/test_http.py
rename to keystoneclient/tests/unit/test_http.py
index 118ad771c..6dfceec54 100644
--- a/keystoneclient/tests/test_http.py
+++ b/keystoneclient/tests/unit/test_http.py
@@ -20,7 +20,7 @@ from testtools import matchers
 from keystoneclient import exceptions
 from keystoneclient import httpclient
 from keystoneclient import session
-from keystoneclient.tests import utils
+from keystoneclient.tests.unit import utils
 
 
 RESPONSE_BODY = '{"hi": "there"}'
diff --git a/keystoneclient/tests/test_https.py b/keystoneclient/tests/unit/test_https.py
similarity index 98%
rename from keystoneclient/tests/test_https.py
rename to keystoneclient/tests/unit/test_https.py
index f9618be98..e574d3750 100644
--- a/keystoneclient/tests/test_https.py
+++ b/keystoneclient/tests/unit/test_https.py
@@ -14,7 +14,7 @@ import mock
 import requests
 
 from keystoneclient import httpclient
-from keystoneclient.tests import utils
+from keystoneclient.tests.unit import utils
 
 
 FAKE_RESPONSE = utils.TestResponse({
diff --git a/keystoneclient/tests/test_keyring.py b/keystoneclient/tests/unit/test_keyring.py
similarity index 98%
rename from keystoneclient/tests/test_keyring.py
rename to keystoneclient/tests/unit/test_keyring.py
index 117931609..a54009e9c 100644
--- a/keystoneclient/tests/test_keyring.py
+++ b/keystoneclient/tests/unit/test_keyring.py
@@ -17,8 +17,8 @@ from oslo_utils import timeutils
 
 from keystoneclient import access
 from keystoneclient import httpclient
-from keystoneclient.tests import utils
-from keystoneclient.tests.v2_0 import client_fixtures
+from keystoneclient.tests.unit import utils
+from keystoneclient.tests.unit.v2_0 import client_fixtures
 
 try:
     import keyring  # noqa
diff --git a/keystoneclient/tests/test_memcache_crypt.py b/keystoneclient/tests/unit/test_memcache_crypt.py
similarity index 100%
rename from keystoneclient/tests/test_memcache_crypt.py
rename to keystoneclient/tests/unit/test_memcache_crypt.py
diff --git a/keystoneclient/tests/test_s3_token_middleware.py b/keystoneclient/tests/unit/test_s3_token_middleware.py
similarity index 99%
rename from keystoneclient/tests/test_s3_token_middleware.py
rename to keystoneclient/tests/unit/test_s3_token_middleware.py
index 037dccae6..63f9e72ba 100644
--- a/keystoneclient/tests/test_s3_token_middleware.py
+++ b/keystoneclient/tests/unit/test_s3_token_middleware.py
@@ -20,7 +20,7 @@ import testtools
 import webob
 
 from keystoneclient.middleware import s3_token
-from keystoneclient.tests import utils
+from keystoneclient.tests.unit import utils
 
 
 GOOD_RESPONSE = {'access': {'token': {'id': 'TOKEN_ID',
diff --git a/keystoneclient/tests/test_session.py b/keystoneclient/tests/unit/test_session.py
similarity index 99%
rename from keystoneclient/tests/test_session.py
rename to keystoneclient/tests/unit/test_session.py
index 06fb1c3fe..1d01c3a43 100644
--- a/keystoneclient/tests/test_session.py
+++ b/keystoneclient/tests/unit/test_session.py
@@ -26,7 +26,7 @@ from keystoneclient import adapter
 from keystoneclient.auth import base
 from keystoneclient import exceptions
 from keystoneclient import session as client_session
-from keystoneclient.tests import utils
+from keystoneclient.tests.unit import utils
 
 
 class SessionTests(utils.TestCase):
diff --git a/keystoneclient/tests/test_shell.py b/keystoneclient/tests/unit/test_shell.py
similarity index 99%
rename from keystoneclient/tests/test_shell.py
rename to keystoneclient/tests/unit/test_shell.py
index 842aa4e67..452f9e793 100644
--- a/keystoneclient/tests/test_shell.py
+++ b/keystoneclient/tests/unit/test_shell.py
@@ -26,7 +26,7 @@ from testtools import matchers
 from keystoneclient import exceptions
 from keystoneclient import session
 from keystoneclient import shell as openstack_shell
-from keystoneclient.tests import utils
+from keystoneclient.tests.unit import utils
 from keystoneclient.v2_0 import shell as shell_v2_0
 
 
diff --git a/keystoneclient/tests/test_utils.py b/keystoneclient/tests/unit/test_utils.py
similarity index 98%
rename from keystoneclient/tests/test_utils.py
rename to keystoneclient/tests/unit/test_utils.py
index 01131e6f1..8f0de9b0f 100644
--- a/keystoneclient/tests/test_utils.py
+++ b/keystoneclient/tests/unit/test_utils.py
@@ -18,8 +18,8 @@ import testresources
 from testtools import matchers
 
 from keystoneclient import exceptions
-from keystoneclient.tests import client_fixtures
-from keystoneclient.tests import utils as test_utils
+from keystoneclient.tests.unit import client_fixtures
+from keystoneclient.tests.unit import utils as test_utils
 from keystoneclient import utils
 
 
diff --git a/keystoneclient/tests/utils.py b/keystoneclient/tests/unit/utils.py
similarity index 100%
rename from keystoneclient/tests/utils.py
rename to keystoneclient/tests/unit/utils.py
diff --git a/keystoneclient/tests/v3/__init__.py b/keystoneclient/tests/unit/v2_0/__init__.py
similarity index 100%
rename from keystoneclient/tests/v3/__init__.py
rename to keystoneclient/tests/unit/v2_0/__init__.py
diff --git a/keystoneclient/tests/v2_0/client_fixtures.py b/keystoneclient/tests/unit/v2_0/client_fixtures.py
similarity index 100%
rename from keystoneclient/tests/v2_0/client_fixtures.py
rename to keystoneclient/tests/unit/v2_0/client_fixtures.py
diff --git a/keystoneclient/tests/v2_0/test_access.py b/keystoneclient/tests/unit/v2_0/test_access.py
similarity index 97%
rename from keystoneclient/tests/v2_0/test_access.py
rename to keystoneclient/tests/unit/v2_0/test_access.py
index b264b3cbf..f05f138d8 100644
--- a/keystoneclient/tests/v2_0/test_access.py
+++ b/keystoneclient/tests/unit/v2_0/test_access.py
@@ -18,9 +18,9 @@ import testresources
 
 from keystoneclient import access
 from keystoneclient import fixture
-from keystoneclient.tests import client_fixtures as token_data
-from keystoneclient.tests.v2_0 import client_fixtures
-from keystoneclient.tests.v2_0 import utils
+from keystoneclient.tests.unit import client_fixtures as token_data
+from keystoneclient.tests.unit.v2_0 import client_fixtures
+from keystoneclient.tests.unit.v2_0 import utils
 
 
 class AccessInfoTest(utils.TestCase, testresources.ResourcedTestCase):
diff --git a/keystoneclient/tests/v2_0/test_auth.py b/keystoneclient/tests/unit/v2_0/test_auth.py
similarity index 99%
rename from keystoneclient/tests/v2_0/test_auth.py
rename to keystoneclient/tests/unit/v2_0/test_auth.py
index c4d5046bc..e61f5c8bb 100644
--- a/keystoneclient/tests/v2_0/test_auth.py
+++ b/keystoneclient/tests/unit/v2_0/test_auth.py
@@ -17,7 +17,7 @@ from oslo_serialization import jsonutils
 from oslo_utils import timeutils
 
 from keystoneclient import exceptions
-from keystoneclient.tests.v2_0 import utils
+from keystoneclient.tests.unit.v2_0 import utils
 from keystoneclient.v2_0 import client
 
 
diff --git a/keystoneclient/tests/v2_0/test_certificates.py b/keystoneclient/tests/unit/v2_0/test_certificates.py
similarity index 93%
rename from keystoneclient/tests/v2_0/test_certificates.py
rename to keystoneclient/tests/unit/v2_0/test_certificates.py
index 432a304fb..fc19d8119 100644
--- a/keystoneclient/tests/v2_0/test_certificates.py
+++ b/keystoneclient/tests/unit/v2_0/test_certificates.py
@@ -13,8 +13,8 @@
 
 import testresources
 
-from keystoneclient.tests import client_fixtures
-from keystoneclient.tests.v2_0 import utils
+from keystoneclient.tests.unit import client_fixtures
+from keystoneclient.tests.unit.v2_0 import utils
 
 
 class CertificateTests(utils.TestCase, testresources.ResourcedTestCase):
diff --git a/keystoneclient/tests/v2_0/test_client.py b/keystoneclient/tests/unit/v2_0/test_client.py
similarity index 98%
rename from keystoneclient/tests/v2_0/test_client.py
rename to keystoneclient/tests/unit/v2_0/test_client.py
index d09f326e6..2700b3182 100644
--- a/keystoneclient/tests/v2_0/test_client.py
+++ b/keystoneclient/tests/unit/v2_0/test_client.py
@@ -19,8 +19,8 @@ from keystoneclient.auth import token_endpoint
 from keystoneclient import exceptions
 from keystoneclient import fixture
 from keystoneclient import session
-from keystoneclient.tests.v2_0 import client_fixtures
-from keystoneclient.tests.v2_0 import utils
+from keystoneclient.tests.unit.v2_0 import client_fixtures
+from keystoneclient.tests.unit.v2_0 import utils
 from keystoneclient.v2_0 import client
 
 
diff --git a/keystoneclient/tests/v2_0/test_discovery.py b/keystoneclient/tests/unit/v2_0/test_discovery.py
similarity index 98%
rename from keystoneclient/tests/v2_0/test_discovery.py
rename to keystoneclient/tests/unit/v2_0/test_discovery.py
index 7c4f320f9..348038a43 100644
--- a/keystoneclient/tests/v2_0/test_discovery.py
+++ b/keystoneclient/tests/unit/v2_0/test_discovery.py
@@ -12,7 +12,7 @@
 
 
 from keystoneclient.generic import client
-from keystoneclient.tests.v2_0 import utils
+from keystoneclient.tests.unit.v2_0 import utils
 
 
 class DiscoverKeystoneTests(utils.UnauthenticatedTestCase):
diff --git a/keystoneclient/tests/v2_0/test_ec2.py b/keystoneclient/tests/unit/v2_0/test_ec2.py
similarity index 98%
rename from keystoneclient/tests/v2_0/test_ec2.py
rename to keystoneclient/tests/unit/v2_0/test_ec2.py
index cfb6fa813..e08d228f2 100644
--- a/keystoneclient/tests/v2_0/test_ec2.py
+++ b/keystoneclient/tests/unit/v2_0/test_ec2.py
@@ -10,7 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from keystoneclient.tests.v2_0 import utils
+from keystoneclient.tests.unit.v2_0 import utils
 from keystoneclient.v2_0 import ec2
 
 
diff --git a/keystoneclient/tests/v2_0/test_endpoints.py b/keystoneclient/tests/unit/v2_0/test_endpoints.py
similarity index 99%
rename from keystoneclient/tests/v2_0/test_endpoints.py
rename to keystoneclient/tests/unit/v2_0/test_endpoints.py
index 5272ca05f..ffc1c65d1 100644
--- a/keystoneclient/tests/v2_0/test_endpoints.py
+++ b/keystoneclient/tests/unit/v2_0/test_endpoints.py
@@ -12,7 +12,7 @@
 
 import uuid
 
-from keystoneclient.tests.v2_0 import utils
+from keystoneclient.tests.unit.v2_0 import utils
 from keystoneclient.v2_0 import endpoints
 
 
diff --git a/keystoneclient/tests/v2_0/test_extensions.py b/keystoneclient/tests/unit/v2_0/test_extensions.py
similarity index 98%
rename from keystoneclient/tests/v2_0/test_extensions.py
rename to keystoneclient/tests/unit/v2_0/test_extensions.py
index 6a77a5ddb..d09943f4b 100644
--- a/keystoneclient/tests/v2_0/test_extensions.py
+++ b/keystoneclient/tests/unit/v2_0/test_extensions.py
@@ -10,7 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from keystoneclient.tests.v2_0 import utils
+from keystoneclient.tests.unit.v2_0 import utils
 from keystoneclient.v2_0 import extensions
 
 
diff --git a/keystoneclient/tests/v2_0/test_roles.py b/keystoneclient/tests/unit/v2_0/test_roles.py
similarity index 98%
rename from keystoneclient/tests/v2_0/test_roles.py
rename to keystoneclient/tests/unit/v2_0/test_roles.py
index bd272246b..74ad1ed54 100644
--- a/keystoneclient/tests/v2_0/test_roles.py
+++ b/keystoneclient/tests/unit/v2_0/test_roles.py
@@ -12,7 +12,7 @@
 
 import uuid
 
-from keystoneclient.tests.v2_0 import utils
+from keystoneclient.tests.unit.v2_0 import utils
 from keystoneclient.v2_0 import roles
 
 
diff --git a/keystoneclient/tests/v2_0/test_service_catalog.py b/keystoneclient/tests/unit/v2_0/test_service_catalog.py
similarity index 98%
rename from keystoneclient/tests/v2_0/test_service_catalog.py
rename to keystoneclient/tests/unit/v2_0/test_service_catalog.py
index bc219fd4e..e9ebf500e 100644
--- a/keystoneclient/tests/v2_0/test_service_catalog.py
+++ b/keystoneclient/tests/unit/v2_0/test_service_catalog.py
@@ -12,8 +12,8 @@
 
 from keystoneclient import access
 from keystoneclient import exceptions
-from keystoneclient.tests.v2_0 import client_fixtures
-from keystoneclient.tests.v2_0 import utils
+from keystoneclient.tests.unit.v2_0 import client_fixtures
+from keystoneclient.tests.unit.v2_0 import utils
 
 
 class ServiceCatalogTest(utils.TestCase):
diff --git a/keystoneclient/tests/v2_0/test_services.py b/keystoneclient/tests/unit/v2_0/test_services.py
similarity index 98%
rename from keystoneclient/tests/v2_0/test_services.py
rename to keystoneclient/tests/unit/v2_0/test_services.py
index aec6811b5..21727453e 100644
--- a/keystoneclient/tests/v2_0/test_services.py
+++ b/keystoneclient/tests/unit/v2_0/test_services.py
@@ -12,7 +12,7 @@
 
 import uuid
 
-from keystoneclient.tests.v2_0 import utils
+from keystoneclient.tests.unit.v2_0 import utils
 from keystoneclient.v2_0 import services
 
 
diff --git a/keystoneclient/tests/v2_0/test_shell.py b/keystoneclient/tests/unit/v2_0/test_shell.py
similarity index 99%
rename from keystoneclient/tests/v2_0/test_shell.py
rename to keystoneclient/tests/unit/v2_0/test_shell.py
index dd195bafd..be91d23df 100644
--- a/keystoneclient/tests/v2_0/test_shell.py
+++ b/keystoneclient/tests/unit/v2_0/test_shell.py
@@ -19,7 +19,7 @@ import six
 from testtools import matchers
 
 from keystoneclient import fixture
-from keystoneclient.tests.v2_0 import utils
+from keystoneclient.tests.unit.v2_0 import utils
 
 
 DEFAULT_USERNAME = 'username'
diff --git a/keystoneclient/tests/v2_0/test_tenants.py b/keystoneclient/tests/unit/v2_0/test_tenants.py
similarity index 99%
rename from keystoneclient/tests/v2_0/test_tenants.py
rename to keystoneclient/tests/unit/v2_0/test_tenants.py
index 444926153..62ca39899 100644
--- a/keystoneclient/tests/v2_0/test_tenants.py
+++ b/keystoneclient/tests/unit/v2_0/test_tenants.py
@@ -14,7 +14,7 @@ import uuid
 
 from keystoneclient import exceptions
 from keystoneclient import fixture
-from keystoneclient.tests.v2_0 import utils
+from keystoneclient.tests.unit.v2_0 import utils
 from keystoneclient.v2_0 import client
 from keystoneclient.v2_0 import tenants
 from keystoneclient.v2_0 import users
diff --git a/keystoneclient/tests/v2_0/test_tokens.py b/keystoneclient/tests/unit/v2_0/test_tokens.py
similarity index 99%
rename from keystoneclient/tests/v2_0/test_tokens.py
rename to keystoneclient/tests/unit/v2_0/test_tokens.py
index f1a3b3493..8a40f8295 100644
--- a/keystoneclient/tests/v2_0/test_tokens.py
+++ b/keystoneclient/tests/unit/v2_0/test_tokens.py
@@ -15,7 +15,7 @@ import uuid
 from keystoneclient import access
 from keystoneclient import exceptions
 from keystoneclient import fixture
-from keystoneclient.tests.v2_0 import utils
+from keystoneclient.tests.unit.v2_0 import utils
 from keystoneclient.v2_0 import client
 from keystoneclient.v2_0 import tokens
 
diff --git a/keystoneclient/tests/v2_0/test_users.py b/keystoneclient/tests/unit/v2_0/test_users.py
similarity index 99%
rename from keystoneclient/tests/v2_0/test_users.py
rename to keystoneclient/tests/unit/v2_0/test_users.py
index 81598df7d..455ca3cf5 100644
--- a/keystoneclient/tests/v2_0/test_users.py
+++ b/keystoneclient/tests/unit/v2_0/test_users.py
@@ -12,7 +12,7 @@
 
 import uuid
 
-from keystoneclient.tests.v2_0 import utils
+from keystoneclient.tests.unit.v2_0 import utils
 from keystoneclient.v2_0 import roles
 from keystoneclient.v2_0 import users
 
diff --git a/keystoneclient/tests/v2_0/utils.py b/keystoneclient/tests/unit/v2_0/utils.py
similarity index 98%
rename from keystoneclient/tests/v2_0/utils.py
rename to keystoneclient/tests/unit/v2_0/utils.py
index 7132236c3..475181f6f 100644
--- a/keystoneclient/tests/v2_0/utils.py
+++ b/keystoneclient/tests/unit/v2_0/utils.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from keystoneclient.tests import utils
+from keystoneclient.tests.unit import utils
 from keystoneclient.v2_0 import client
 
 TestResponse = utils.TestResponse
diff --git a/keystoneclient/tests/unit/v3/__init__.py b/keystoneclient/tests/unit/v3/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/keystoneclient/tests/v3/client_fixtures.py b/keystoneclient/tests/unit/v3/client_fixtures.py
similarity index 100%
rename from keystoneclient/tests/v3/client_fixtures.py
rename to keystoneclient/tests/unit/v3/client_fixtures.py
diff --git a/keystoneclient/tests/v3/examples/xml/ADFS_RequestSecurityTokenResponse.xml b/keystoneclient/tests/unit/v3/examples/xml/ADFS_RequestSecurityTokenResponse.xml
similarity index 100%
rename from keystoneclient/tests/v3/examples/xml/ADFS_RequestSecurityTokenResponse.xml
rename to keystoneclient/tests/unit/v3/examples/xml/ADFS_RequestSecurityTokenResponse.xml
diff --git a/keystoneclient/tests/v3/examples/xml/ADFS_fault.xml b/keystoneclient/tests/unit/v3/examples/xml/ADFS_fault.xml
similarity index 100%
rename from keystoneclient/tests/v3/examples/xml/ADFS_fault.xml
rename to keystoneclient/tests/unit/v3/examples/xml/ADFS_fault.xml
diff --git a/keystoneclient/tests/v3/saml2_fixtures.py b/keystoneclient/tests/unit/v3/saml2_fixtures.py
similarity index 100%
rename from keystoneclient/tests/v3/saml2_fixtures.py
rename to keystoneclient/tests/unit/v3/saml2_fixtures.py
diff --git a/keystoneclient/tests/v3/test_access.py b/keystoneclient/tests/unit/v3/test_access.py
similarity index 98%
rename from keystoneclient/tests/v3/test_access.py
rename to keystoneclient/tests/unit/v3/test_access.py
index ba9c2b72e..d3107af4a 100644
--- a/keystoneclient/tests/v3/test_access.py
+++ b/keystoneclient/tests/unit/v3/test_access.py
@@ -17,8 +17,8 @@ from oslo_utils import timeutils
 
 from keystoneclient import access
 from keystoneclient import fixture
-from keystoneclient.tests.v3 import client_fixtures
-from keystoneclient.tests.v3 import utils
+from keystoneclient.tests.unit.v3 import client_fixtures
+from keystoneclient.tests.unit.v3 import utils
 
 
 TOKEN_RESPONSE = utils.TestResponse({
diff --git a/keystoneclient/tests/v3/test_auth.py b/keystoneclient/tests/unit/v3/test_auth.py
similarity index 99%
rename from keystoneclient/tests/v3/test_auth.py
rename to keystoneclient/tests/unit/v3/test_auth.py
index 59f5de5af..506b02689 100644
--- a/keystoneclient/tests/v3/test_auth.py
+++ b/keystoneclient/tests/unit/v3/test_auth.py
@@ -13,7 +13,7 @@
 from oslo_serialization import jsonutils
 
 from keystoneclient import exceptions
-from keystoneclient.tests.v3 import utils
+from keystoneclient.tests.unit.v3 import utils
 from keystoneclient.v3 import client
 
 
diff --git a/keystoneclient/tests/v3/test_auth_saml2.py b/keystoneclient/tests/unit/v3/test_auth_saml2.py
similarity index 99%
rename from keystoneclient/tests/v3/test_auth_saml2.py
rename to keystoneclient/tests/unit/v3/test_auth_saml2.py
index c2579c86f..c54cf24e6 100644
--- a/keystoneclient/tests/v3/test_auth_saml2.py
+++ b/keystoneclient/tests/unit/v3/test_auth_saml2.py
@@ -22,9 +22,9 @@ from keystoneclient.auth import conf
 from keystoneclient.contrib.auth.v3 import saml2
 from keystoneclient import exceptions
 from keystoneclient import session
-from keystoneclient.tests.v3 import client_fixtures
-from keystoneclient.tests.v3 import saml2_fixtures
-from keystoneclient.tests.v3 import utils
+from keystoneclient.tests.unit.v3 import client_fixtures
+from keystoneclient.tests.unit.v3 import saml2_fixtures
+from keystoneclient.tests.unit.v3 import utils
 
 ROOTDIR = os.path.dirname(os.path.abspath(__file__))
 XMLDIR = os.path.join(ROOTDIR, 'examples', 'xml/')
diff --git a/keystoneclient/tests/v3/test_client.py b/keystoneclient/tests/unit/v3/test_client.py
similarity index 98%
rename from keystoneclient/tests/v3/test_client.py
rename to keystoneclient/tests/unit/v3/test_client.py
index e1a85424d..6be09c117 100644
--- a/keystoneclient/tests/v3/test_client.py
+++ b/keystoneclient/tests/unit/v3/test_client.py
@@ -19,8 +19,8 @@ import six
 from keystoneclient.auth import token_endpoint
 from keystoneclient import exceptions
 from keystoneclient import session
-from keystoneclient.tests.v3 import client_fixtures
-from keystoneclient.tests.v3 import utils
+from keystoneclient.tests.unit.v3 import client_fixtures
+from keystoneclient.tests.unit.v3 import utils
 from keystoneclient.v3 import client
 
 
diff --git a/keystoneclient/tests/v3/test_credentials.py b/keystoneclient/tests/unit/v3/test_credentials.py
similarity index 97%
rename from keystoneclient/tests/v3/test_credentials.py
rename to keystoneclient/tests/unit/v3/test_credentials.py
index 5dad49c9c..752f25ac5 100644
--- a/keystoneclient/tests/v3/test_credentials.py
+++ b/keystoneclient/tests/unit/v3/test_credentials.py
@@ -12,7 +12,7 @@
 
 import uuid
 
-from keystoneclient.tests.v3 import utils
+from keystoneclient.tests.unit.v3 import utils
 from keystoneclient.v3 import credentials
 
 
diff --git a/keystoneclient/tests/v3/test_discover.py b/keystoneclient/tests/unit/v3/test_discover.py
similarity index 98%
rename from keystoneclient/tests/v3/test_discover.py
rename to keystoneclient/tests/unit/v3/test_discover.py
index 4a1dee371..f73c3d7fa 100644
--- a/keystoneclient/tests/v3/test_discover.py
+++ b/keystoneclient/tests/unit/v3/test_discover.py
@@ -11,7 +11,7 @@
 #    under the License.
 
 from keystoneclient.generic import client
-from keystoneclient.tests.v3 import utils
+from keystoneclient.tests.unit.v3 import utils
 
 
 class DiscoverKeystoneTests(utils.UnauthenticatedTestCase):
diff --git a/keystoneclient/tests/v3/test_domains.py b/keystoneclient/tests/unit/v3/test_domains.py
similarity index 97%
rename from keystoneclient/tests/v3/test_domains.py
rename to keystoneclient/tests/unit/v3/test_domains.py
index 38ad8e4f2..9cc23e7eb 100644
--- a/keystoneclient/tests/v3/test_domains.py
+++ b/keystoneclient/tests/unit/v3/test_domains.py
@@ -12,7 +12,7 @@
 
 import uuid
 
-from keystoneclient.tests.v3 import utils
+from keystoneclient.tests.unit.v3 import utils
 from keystoneclient.v3 import domains
 
 
diff --git a/keystoneclient/tests/v3/test_endpoint_filter.py b/keystoneclient/tests/unit/v3/test_endpoint_filter.py
similarity index 99%
rename from keystoneclient/tests/v3/test_endpoint_filter.py
rename to keystoneclient/tests/unit/v3/test_endpoint_filter.py
index 867193a1e..eaca264c7 100644
--- a/keystoneclient/tests/v3/test_endpoint_filter.py
+++ b/keystoneclient/tests/unit/v3/test_endpoint_filter.py
@@ -14,7 +14,7 @@
 
 import uuid
 
-from keystoneclient.tests.v3 import utils
+from keystoneclient.tests.unit.v3 import utils
 
 
 class EndpointTestUtils(object):
diff --git a/keystoneclient/tests/v3/test_endpoint_policy.py b/keystoneclient/tests/unit/v3/test_endpoint_policy.py
similarity index 98%
rename from keystoneclient/tests/v3/test_endpoint_policy.py
rename to keystoneclient/tests/unit/v3/test_endpoint_policy.py
index 591591093..ce9efb4c6 100644
--- a/keystoneclient/tests/v3/test_endpoint_policy.py
+++ b/keystoneclient/tests/unit/v3/test_endpoint_policy.py
@@ -14,8 +14,8 @@
 
 import uuid
 
-from keystoneclient.tests.v3 import test_endpoint_filter
-from keystoneclient.tests.v3 import utils
+from keystoneclient.tests.unit.v3 import test_endpoint_filter
+from keystoneclient.tests.unit.v3 import utils
 
 
 class EndpointPolicyTests(utils.TestCase,
diff --git a/keystoneclient/tests/v3/test_endpoints.py b/keystoneclient/tests/unit/v3/test_endpoints.py
similarity index 98%
rename from keystoneclient/tests/v3/test_endpoints.py
rename to keystoneclient/tests/unit/v3/test_endpoints.py
index 5319373ef..000718a68 100644
--- a/keystoneclient/tests/v3/test_endpoints.py
+++ b/keystoneclient/tests/unit/v3/test_endpoints.py
@@ -13,7 +13,7 @@
 import uuid
 
 from keystoneclient import exceptions
-from keystoneclient.tests.v3 import utils
+from keystoneclient.tests.unit.v3 import utils
 from keystoneclient.v3 import endpoints
 
 
diff --git a/keystoneclient/tests/v3/test_federation.py b/keystoneclient/tests/unit/v3/test_federation.py
similarity index 99%
rename from keystoneclient/tests/v3/test_federation.py
rename to keystoneclient/tests/unit/v3/test_federation.py
index eed66809c..19ec44f55 100644
--- a/keystoneclient/tests/v3/test_federation.py
+++ b/keystoneclient/tests/unit/v3/test_federation.py
@@ -16,7 +16,7 @@ import uuid
 from keystoneclient import access
 from keystoneclient import exceptions
 from keystoneclient import fixture
-from keystoneclient.tests.v3 import utils
+from keystoneclient.tests.unit.v3 import utils
 from keystoneclient.v3.contrib.federation import base
 from keystoneclient.v3.contrib.federation import identity_providers
 from keystoneclient.v3.contrib.federation import mappings
diff --git a/keystoneclient/tests/v3/test_groups.py b/keystoneclient/tests/unit/v3/test_groups.py
similarity index 97%
rename from keystoneclient/tests/v3/test_groups.py
rename to keystoneclient/tests/unit/v3/test_groups.py
index 7fa087051..6ed140cef 100644
--- a/keystoneclient/tests/v3/test_groups.py
+++ b/keystoneclient/tests/unit/v3/test_groups.py
@@ -14,7 +14,7 @@
 
 import uuid
 
-from keystoneclient.tests.v3 import utils
+from keystoneclient.tests.unit.v3 import utils
 from keystoneclient.v3 import groups
 
 
diff --git a/keystoneclient/tests/v3/test_oauth1.py b/keystoneclient/tests/unit/v3/test_oauth1.py
similarity index 99%
rename from keystoneclient/tests/v3/test_oauth1.py
rename to keystoneclient/tests/unit/v3/test_oauth1.py
index 6248bd94c..d259053fb 100644
--- a/keystoneclient/tests/v3/test_oauth1.py
+++ b/keystoneclient/tests/unit/v3/test_oauth1.py
@@ -20,8 +20,8 @@ from six.moves.urllib import parse as urlparse
 from testtools import matchers
 
 from keystoneclient import session
-from keystoneclient.tests.v3 import client_fixtures
-from keystoneclient.tests.v3 import utils
+from keystoneclient.tests.unit.v3 import client_fixtures
+from keystoneclient.tests.unit.v3 import utils
 from keystoneclient.v3.contrib.oauth1 import access_tokens
 from keystoneclient.v3.contrib.oauth1 import auth
 from keystoneclient.v3.contrib.oauth1 import consumers
diff --git a/keystoneclient/tests/v3/test_policies.py b/keystoneclient/tests/unit/v3/test_policies.py
similarity index 95%
rename from keystoneclient/tests/v3/test_policies.py
rename to keystoneclient/tests/unit/v3/test_policies.py
index 45bce7191..a7f8d8afd 100644
--- a/keystoneclient/tests/v3/test_policies.py
+++ b/keystoneclient/tests/unit/v3/test_policies.py
@@ -12,7 +12,7 @@
 
 import uuid
 
-from keystoneclient.tests.v3 import utils
+from keystoneclient.tests.unit.v3 import utils
 from keystoneclient.v3 import policies
 
 
diff --git a/keystoneclient/tests/v3/test_projects.py b/keystoneclient/tests/unit/v3/test_projects.py
similarity index 99%
rename from keystoneclient/tests/v3/test_projects.py
rename to keystoneclient/tests/unit/v3/test_projects.py
index 4c382086d..5d08bb233 100644
--- a/keystoneclient/tests/v3/test_projects.py
+++ b/keystoneclient/tests/unit/v3/test_projects.py
@@ -13,7 +13,7 @@
 import uuid
 
 from keystoneclient import exceptions
-from keystoneclient.tests.v3 import utils
+from keystoneclient.tests.unit.v3 import utils
 from keystoneclient.v3 import projects
 
 
diff --git a/keystoneclient/tests/v3/test_regions.py b/keystoneclient/tests/unit/v3/test_regions.py
similarity index 96%
rename from keystoneclient/tests/v3/test_regions.py
rename to keystoneclient/tests/unit/v3/test_regions.py
index 7f3343e73..392f79f97 100644
--- a/keystoneclient/tests/v3/test_regions.py
+++ b/keystoneclient/tests/unit/v3/test_regions.py
@@ -14,7 +14,7 @@
 import uuid
 
 
-from keystoneclient.tests.v3 import utils
+from keystoneclient.tests.unit.v3 import utils
 from keystoneclient.v3 import regions
 
 
diff --git a/keystoneclient/tests/v3/test_role_assignments.py b/keystoneclient/tests/unit/v3/test_role_assignments.py
similarity index 99%
rename from keystoneclient/tests/v3/test_role_assignments.py
rename to keystoneclient/tests/unit/v3/test_role_assignments.py
index f47d9ec60..1a664c966 100644
--- a/keystoneclient/tests/v3/test_role_assignments.py
+++ b/keystoneclient/tests/unit/v3/test_role_assignments.py
@@ -11,7 +11,7 @@
 #    under the License.
 
 from keystoneclient import exceptions
-from keystoneclient.tests.v3 import utils
+from keystoneclient.tests.unit.v3 import utils
 from keystoneclient.v3 import role_assignments
 
 
diff --git a/keystoneclient/tests/v3/test_roles.py b/keystoneclient/tests/unit/v3/test_roles.py
similarity index 99%
rename from keystoneclient/tests/v3/test_roles.py
rename to keystoneclient/tests/unit/v3/test_roles.py
index 151a337d0..2a71bf32e 100644
--- a/keystoneclient/tests/v3/test_roles.py
+++ b/keystoneclient/tests/unit/v3/test_roles.py
@@ -15,7 +15,7 @@
 import uuid
 
 from keystoneclient import exceptions
-from keystoneclient.tests.v3 import utils
+from keystoneclient.tests.unit.v3 import utils
 from keystoneclient.v3 import roles
 
 
diff --git a/keystoneclient/tests/v3/test_service_catalog.py b/keystoneclient/tests/unit/v3/test_service_catalog.py
similarity index 98%
rename from keystoneclient/tests/v3/test_service_catalog.py
rename to keystoneclient/tests/unit/v3/test_service_catalog.py
index 7a96c3a25..a187302a3 100644
--- a/keystoneclient/tests/v3/test_service_catalog.py
+++ b/keystoneclient/tests/unit/v3/test_service_catalog.py
@@ -12,8 +12,8 @@
 
 from keystoneclient import access
 from keystoneclient import exceptions
-from keystoneclient.tests.v3 import client_fixtures
-from keystoneclient.tests.v3 import utils
+from keystoneclient.tests.unit.v3 import client_fixtures
+from keystoneclient.tests.unit.v3 import utils
 
 
 class ServiceCatalogTest(utils.TestCase):
diff --git a/keystoneclient/tests/v3/test_services.py b/keystoneclient/tests/unit/v3/test_services.py
similarity index 97%
rename from keystoneclient/tests/v3/test_services.py
rename to keystoneclient/tests/unit/v3/test_services.py
index 536724116..40dde475b 100644
--- a/keystoneclient/tests/v3/test_services.py
+++ b/keystoneclient/tests/unit/v3/test_services.py
@@ -12,7 +12,7 @@
 
 import uuid
 
-from keystoneclient.tests.v3 import utils
+from keystoneclient.tests.unit.v3 import utils
 from keystoneclient.v3 import services
 
 
diff --git a/keystoneclient/tests/v3/test_tokens.py b/keystoneclient/tests/unit/v3/test_tokens.py
similarity index 97%
rename from keystoneclient/tests/v3/test_tokens.py
rename to keystoneclient/tests/unit/v3/test_tokens.py
index 01f81a2e1..2c27fd097 100644
--- a/keystoneclient/tests/v3/test_tokens.py
+++ b/keystoneclient/tests/unit/v3/test_tokens.py
@@ -16,8 +16,8 @@ import testresources
 
 from keystoneclient import access
 from keystoneclient import exceptions
-from keystoneclient.tests import client_fixtures
-from keystoneclient.tests.v3 import utils
+from keystoneclient.tests.unit import client_fixtures
+from keystoneclient.tests.unit.v3 import utils
 
 
 class TokenTests(utils.TestCase, testresources.ResourcedTestCase):
diff --git a/keystoneclient/tests/v3/test_trusts.py b/keystoneclient/tests/unit/v3/test_trusts.py
similarity index 98%
rename from keystoneclient/tests/v3/test_trusts.py
rename to keystoneclient/tests/unit/v3/test_trusts.py
index f72e164b5..fbd8fdead 100644
--- a/keystoneclient/tests/v3/test_trusts.py
+++ b/keystoneclient/tests/unit/v3/test_trusts.py
@@ -16,7 +16,7 @@ import uuid
 from oslo_utils import timeutils
 
 from keystoneclient import exceptions
-from keystoneclient.tests.v3 import utils
+from keystoneclient.tests.unit.v3 import utils
 from keystoneclient.v3.contrib import trusts
 
 
diff --git a/keystoneclient/tests/v3/test_users.py b/keystoneclient/tests/unit/v3/test_users.py
similarity index 99%
rename from keystoneclient/tests/v3/test_users.py
rename to keystoneclient/tests/unit/v3/test_users.py
index f11bef2be..4645d6e20 100644
--- a/keystoneclient/tests/v3/test_users.py
+++ b/keystoneclient/tests/unit/v3/test_users.py
@@ -15,7 +15,7 @@
 import uuid
 
 from keystoneclient import exceptions
-from keystoneclient.tests.v3 import utils
+from keystoneclient.tests.unit.v3 import utils
 from keystoneclient.v3 import users
 
 
diff --git a/keystoneclient/tests/v3/utils.py b/keystoneclient/tests/unit/v3/utils.py
similarity index 99%
rename from keystoneclient/tests/v3/utils.py
rename to keystoneclient/tests/unit/v3/utils.py
index f1b993459..732068771 100644
--- a/keystoneclient/tests/v3/utils.py
+++ b/keystoneclient/tests/unit/v3/utils.py
@@ -15,7 +15,7 @@ import uuid
 import six
 from six.moves.urllib import parse as urlparse
 
-from keystoneclient.tests import utils
+from keystoneclient.tests.unit import utils
 from keystoneclient.v3 import client