diff --git a/keystoneauth1/tests/unit/auth/__init__.py b/keystoneauth1/tests/unit/access/__init__.py
similarity index 100%
rename from keystoneauth1/tests/unit/auth/__init__.py
rename to keystoneauth1/tests/unit/access/__init__.py
diff --git a/keystoneauth1/tests/unit/v2_0/test_service_catalog.py b/keystoneauth1/tests/unit/access/test_v2_service_catalog.py
similarity index 100%
rename from keystoneauth1/tests/unit/v2_0/test_service_catalog.py
rename to keystoneauth1/tests/unit/access/test_v2_service_catalog.py
diff --git a/keystoneauth1/tests/unit/v3/test_service_catalog.py b/keystoneauth1/tests/unit/access/test_v3_service_catalog.py
similarity index 100%
rename from keystoneauth1/tests/unit/v3/test_service_catalog.py
rename to keystoneauth1/tests/unit/access/test_v3_service_catalog.py
diff --git a/keystoneauth1/tests/unit/v2_0/__init__.py b/keystoneauth1/tests/unit/identity/__init__.py
similarity index 100%
rename from keystoneauth1/tests/unit/v2_0/__init__.py
rename to keystoneauth1/tests/unit/identity/__init__.py
diff --git a/keystoneauth1/tests/unit/auth/test_access.py b/keystoneauth1/tests/unit/identity/test_access.py
similarity index 100%
rename from keystoneauth1/tests/unit/auth/test_access.py
rename to keystoneauth1/tests/unit/identity/test_access.py
diff --git a/keystoneauth1/tests/unit/auth/test_identity_common.py b/keystoneauth1/tests/unit/identity/test_identity_common.py
similarity index 100%
rename from keystoneauth1/tests/unit/auth/test_identity_common.py
rename to keystoneauth1/tests/unit/identity/test_identity_common.py
diff --git a/keystoneauth1/tests/unit/auth/test_identity_v2.py b/keystoneauth1/tests/unit/identity/test_identity_v2.py
similarity index 100%
rename from keystoneauth1/tests/unit/auth/test_identity_v2.py
rename to keystoneauth1/tests/unit/identity/test_identity_v2.py
diff --git a/keystoneauth1/tests/unit/auth/test_identity_v3.py b/keystoneauth1/tests/unit/identity/test_identity_v3.py
similarity index 100%
rename from keystoneauth1/tests/unit/auth/test_identity_v3.py
rename to keystoneauth1/tests/unit/identity/test_identity_v3.py
diff --git a/keystoneauth1/tests/unit/auth/test_identity_v3_federation.py b/keystoneauth1/tests/unit/identity/test_identity_v3_federation.py
similarity index 100%
rename from keystoneauth1/tests/unit/auth/test_identity_v3_federation.py
rename to keystoneauth1/tests/unit/identity/test_identity_v3_federation.py
diff --git a/keystoneauth1/tests/unit/auth/test_password.py b/keystoneauth1/tests/unit/identity/test_password.py
similarity index 98%
rename from keystoneauth1/tests/unit/auth/test_password.py
rename to keystoneauth1/tests/unit/identity/test_password.py
index d06e4f79..1f6116d0 100644
--- a/keystoneauth1/tests/unit/auth/test_password.py
+++ b/keystoneauth1/tests/unit/identity/test_password.py
@@ -17,7 +17,7 @@ from keystoneauth1.identity import v2
 from keystoneauth1.identity import v3
 from keystoneauth1.identity.v3 import password as v3_password
 from keystoneauth1.loading._plugins.identity import generic
-from keystoneauth1.tests.unit.auth import utils
+from keystoneauth1.tests.unit.identity import utils
 
 
 class PasswordTests(utils.GenericPluginTestCase):
diff --git a/keystoneauth1/tests/unit/auth/test_token.py b/keystoneauth1/tests/unit/identity/test_token.py
similarity index 97%
rename from keystoneauth1/tests/unit/auth/test_token.py
rename to keystoneauth1/tests/unit/identity/test_token.py
index 5d8c7b88..f7471d21 100644
--- a/keystoneauth1/tests/unit/auth/test_token.py
+++ b/keystoneauth1/tests/unit/identity/test_token.py
@@ -17,7 +17,7 @@ from keystoneauth1.identity import v2
 from keystoneauth1.identity import v3
 from keystoneauth1.identity.v3 import token as v3_token
 from keystoneauth1.loading._plugins.identity import generic
-from keystoneauth1.tests.unit.auth import utils
+from keystoneauth1.tests.unit.identity import utils
 
 
 class TokenTests(utils.GenericPluginTestCase):
diff --git a/keystoneauth1/tests/unit/auth/utils.py b/keystoneauth1/tests/unit/identity/utils.py
similarity index 100%
rename from keystoneauth1/tests/unit/auth/utils.py
rename to keystoneauth1/tests/unit/identity/utils.py
diff --git a/keystoneauth1/tests/unit/auth/test_token_endpoint.py b/keystoneauth1/tests/unit/test_token_endpoint.py
similarity index 100%
rename from keystoneauth1/tests/unit/auth/test_token_endpoint.py
rename to keystoneauth1/tests/unit/test_token_endpoint.py
diff --git a/keystoneauth1/tests/unit/v3/__init__.py b/keystoneauth1/tests/unit/v3/__init__.py
deleted file mode 100644
index e69de29b..00000000