diff --git a/keystonemiddleware/tests/auth_token/__init__.py b/keystonemiddleware/tests/unit/__init__.py
similarity index 100%
rename from keystonemiddleware/tests/auth_token/__init__.py
rename to keystonemiddleware/tests/unit/__init__.py
diff --git a/keystonemiddleware/tests/unit/auth_token/__init__.py b/keystonemiddleware/tests/unit/auth_token/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/keystonemiddleware/tests/auth_token/test_auth.py b/keystonemiddleware/tests/unit/auth_token/test_auth.py
similarity index 100%
rename from keystonemiddleware/tests/auth_token/test_auth.py
rename to keystonemiddleware/tests/unit/auth_token/test_auth.py
diff --git a/keystonemiddleware/tests/auth_token/test_auth_token_middleware.py b/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py
similarity index 99%
rename from keystonemiddleware/tests/auth_token/test_auth_token_middleware.py
rename to keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py
index 2810243e..97fcc557 100644
--- a/keystonemiddleware/tests/auth_token/test_auth_token_middleware.py
+++ b/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py
@@ -47,8 +47,8 @@ from keystonemiddleware.auth_token import _base
 from keystonemiddleware.auth_token import _exceptions as exc
 from keystonemiddleware.auth_token import _revocations
 from keystonemiddleware.openstack.common import memorycache
-from keystonemiddleware.tests import client_fixtures
-from keystonemiddleware.tests import utils
+from keystonemiddleware.tests.unit import client_fixtures
+from keystonemiddleware.tests.unit import utils
 
 
 EXPECTED_V2_DEFAULT_ENV_RESPONSE = {
diff --git a/keystonemiddleware/tests/auth_token/test_memcache_crypt.py b/keystonemiddleware/tests/unit/auth_token/test_memcache_crypt.py
similarity index 100%
rename from keystonemiddleware/tests/auth_token/test_memcache_crypt.py
rename to keystonemiddleware/tests/unit/auth_token/test_memcache_crypt.py
diff --git a/keystonemiddleware/tests/auth_token/test_revocations.py b/keystonemiddleware/tests/unit/auth_token/test_revocations.py
similarity index 100%
rename from keystonemiddleware/tests/auth_token/test_revocations.py
rename to keystonemiddleware/tests/unit/auth_token/test_revocations.py
diff --git a/keystonemiddleware/tests/auth_token/test_signing_dir.py b/keystonemiddleware/tests/unit/auth_token/test_signing_dir.py
similarity index 100%
rename from keystonemiddleware/tests/auth_token/test_signing_dir.py
rename to keystonemiddleware/tests/unit/auth_token/test_signing_dir.py
diff --git a/keystonemiddleware/tests/auth_token/test_utils.py b/keystonemiddleware/tests/unit/auth_token/test_utils.py
similarity index 100%
rename from keystonemiddleware/tests/auth_token/test_utils.py
rename to keystonemiddleware/tests/unit/auth_token/test_utils.py
diff --git a/keystonemiddleware/tests/client_fixtures.py b/keystonemiddleware/tests/unit/client_fixtures.py
similarity index 99%
rename from keystonemiddleware/tests/client_fixtures.py
rename to keystonemiddleware/tests/unit/client_fixtures.py
index 26ca09d9..ee4111ec 100644
--- a/keystonemiddleware/tests/client_fixtures.py
+++ b/keystonemiddleware/tests/unit/client_fixtures.py
@@ -25,7 +25,7 @@ import testresources
 
 
 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/keystonemiddleware/tests/test_audit_middleware.py b/keystonemiddleware/tests/unit/test_audit_middleware.py
similarity index 100%
rename from keystonemiddleware/tests/test_audit_middleware.py
rename to keystonemiddleware/tests/unit/test_audit_middleware.py
diff --git a/keystonemiddleware/tests/test_connection_pool.py b/keystonemiddleware/tests/unit/test_connection_pool.py
similarity index 98%
rename from keystonemiddleware/tests/test_connection_pool.py
rename to keystonemiddleware/tests/unit/test_connection_pool.py
index c5152764..7f8d56f0 100644
--- a/keystonemiddleware/tests/test_connection_pool.py
+++ b/keystonemiddleware/tests/unit/test_connection_pool.py
@@ -18,7 +18,7 @@ import testtools
 from testtools import matchers
 
 from keystonemiddleware import _memcache_pool
-from keystonemiddleware.tests import utils
+from keystonemiddleware.tests.unit import utils
 
 
 class _TestConnectionPool(_memcache_pool.ConnectionPool):
diff --git a/keystonemiddleware/tests/test_opts.py b/keystonemiddleware/tests/unit/test_opts.py
similarity index 98%
rename from keystonemiddleware/tests/test_opts.py
rename to keystonemiddleware/tests/unit/test_opts.py
index eeeb84fe..93e1b06e 100644
--- a/keystonemiddleware/tests/test_opts.py
+++ b/keystonemiddleware/tests/unit/test_opts.py
@@ -16,7 +16,7 @@ import pkg_resources
 from testtools import matchers
 
 from keystonemiddleware import opts
-from keystonemiddleware.tests import utils
+from keystonemiddleware.tests.unit import utils
 
 
 class OptsTestCase(utils.TestCase):
diff --git a/keystonemiddleware/tests/test_s3_token_middleware.py b/keystonemiddleware/tests/unit/test_s3_token_middleware.py
similarity index 99%
rename from keystonemiddleware/tests/test_s3_token_middleware.py
rename to keystonemiddleware/tests/unit/test_s3_token_middleware.py
index fdadb76b..2bcdf894 100644
--- a/keystonemiddleware/tests/test_s3_token_middleware.py
+++ b/keystonemiddleware/tests/unit/test_s3_token_middleware.py
@@ -21,7 +21,7 @@ import testtools
 import webob
 
 from keystonemiddleware import s3_token
-from keystonemiddleware.tests import utils
+from keystonemiddleware.tests.unit import utils
 
 
 GOOD_RESPONSE = {'access': {'token': {'id': 'TOKEN_ID',
diff --git a/keystonemiddleware/tests/utils.py b/keystonemiddleware/tests/unit/utils.py
similarity index 100%
rename from keystonemiddleware/tests/utils.py
rename to keystonemiddleware/tests/unit/utils.py