diff --git a/tests/storage/__init__.py b/tests/unit/storage/__init__.py
similarity index 100%
rename from tests/storage/__init__.py
rename to tests/unit/storage/__init__.py
diff --git a/tests/storage/base.py b/tests/unit/storage/base.py
similarity index 100%
rename from tests/storage/base.py
rename to tests/unit/storage/base.py
diff --git a/tests/storage/test_impl_mongodb.py b/tests/unit/storage/test_impl_mongodb.py
similarity index 100%
rename from tests/storage/test_impl_mongodb.py
rename to tests/unit/storage/test_impl_mongodb.py
diff --git a/tests/storage/test_impl_sqlite.py b/tests/unit/storage/test_impl_sqlite.py
similarity index 100%
rename from tests/storage/test_impl_sqlite.py
rename to tests/unit/storage/test_impl_sqlite.py
diff --git a/tests/test_bootstrap.py b/tests/unit/test_bootstrap.py
similarity index 100%
rename from tests/test_bootstrap.py
rename to tests/unit/test_bootstrap.py
diff --git a/tests/test_config.py b/tests/unit/test_config.py
similarity index 100%
rename from tests/test_config.py
rename to tests/unit/test_config.py
diff --git a/tests/transport/__init__.py b/tests/unit/transport/__init__.py
similarity index 100%
rename from tests/transport/__init__.py
rename to tests/unit/transport/__init__.py
diff --git a/tests/transport/test_auth.py b/tests/unit/transport/test_auth.py
similarity index 100%
rename from tests/transport/test_auth.py
rename to tests/unit/transport/test_auth.py
diff --git a/tests/transport/wsgi/__init__.py b/tests/unit/transport/wsgi/__init__.py
similarity index 100%
rename from tests/transport/wsgi/__init__.py
rename to tests/unit/transport/wsgi/__init__.py
diff --git a/tests/transport/wsgi/base.py b/tests/unit/transport/wsgi/base.py
similarity index 100%
rename from tests/transport/wsgi/base.py
rename to tests/unit/transport/wsgi/base.py
diff --git a/tests/transport/wsgi/test_auth.py b/tests/unit/transport/wsgi/test_auth.py
similarity index 100%
rename from tests/transport/wsgi/test_auth.py
rename to tests/unit/transport/wsgi/test_auth.py
diff --git a/tests/transport/wsgi/test_claims.py b/tests/unit/transport/wsgi/test_claims.py
similarity index 100%
rename from tests/transport/wsgi/test_claims.py
rename to tests/unit/transport/wsgi/test_claims.py
diff --git a/tests/transport/wsgi/test_health.py b/tests/unit/transport/wsgi/test_health.py
similarity index 100%
rename from tests/transport/wsgi/test_health.py
rename to tests/unit/transport/wsgi/test_health.py
diff --git a/tests/transport/wsgi/test_home.py b/tests/unit/transport/wsgi/test_home.py
similarity index 100%
rename from tests/transport/wsgi/test_home.py
rename to tests/unit/transport/wsgi/test_home.py
diff --git a/tests/transport/wsgi/test_media_type.py b/tests/unit/transport/wsgi/test_media_type.py
similarity index 100%
rename from tests/transport/wsgi/test_media_type.py
rename to tests/unit/transport/wsgi/test_media_type.py
diff --git a/tests/transport/wsgi/test_messages.py b/tests/unit/transport/wsgi/test_messages.py
similarity index 100%
rename from tests/transport/wsgi/test_messages.py
rename to tests/unit/transport/wsgi/test_messages.py
diff --git a/tests/transport/wsgi/test_queue_lifecycle.py b/tests/unit/transport/wsgi/test_queue_lifecycle.py
similarity index 100%
rename from tests/transport/wsgi/test_queue_lifecycle.py
rename to tests/unit/transport/wsgi/test_queue_lifecycle.py
diff --git a/tests/transport/wsgi/test_utils.py b/tests/unit/transport/wsgi/test_utils.py
similarity index 100%
rename from tests/transport/wsgi/test_utils.py
rename to tests/unit/transport/wsgi/test_utils.py
diff --git a/tests/transport/wsgi/test_validation.py b/tests/unit/transport/wsgi/test_validation.py
similarity index 100%
rename from tests/transport/wsgi/test_validation.py
rename to tests/unit/transport/wsgi/test_validation.py