diff --git a/marconi/tests/storage/__init__.py b/marconi/tests/queues/__init__.py
similarity index 100%
rename from marconi/tests/storage/__init__.py
rename to marconi/tests/queues/__init__.py
diff --git a/tests/unit/storage/__init__.py b/marconi/tests/queues/storage/__init__.py
similarity index 100%
rename from tests/unit/storage/__init__.py
rename to marconi/tests/queues/storage/__init__.py
diff --git a/marconi/tests/storage/base.py b/marconi/tests/queues/storage/base.py
similarity index 100%
rename from marconi/tests/storage/base.py
rename to marconi/tests/queues/storage/base.py
diff --git a/tests/unit/proxy/base.py b/tests/unit/proxy/base.py
index 25ac6e04a..fa05b324c 100644
--- a/tests/unit/proxy/base.py
+++ b/tests/unit/proxy/base.py
@@ -21,7 +21,7 @@ from wsgiref import simple_server
 from falcon import testing as ftest
 
 from marconi.proxy import app
-from tests.unit.transport.wsgi import base
+from tests.unit.queues.transport.wsgi import base
 
 
 class TestBase(base.TestBase):
diff --git a/tests/unit/transport/__init__.py b/tests/unit/queues/__init__.py
similarity index 100%
rename from tests/unit/transport/__init__.py
rename to tests/unit/queues/__init__.py
diff --git a/tests/unit/transport/wsgi/__init__.py b/tests/unit/queues/storage/__init__.py
similarity index 100%
rename from tests/unit/transport/wsgi/__init__.py
rename to tests/unit/queues/storage/__init__.py
diff --git a/tests/unit/storage/test_impl_mongodb.py b/tests/unit/queues/storage/test_impl_mongodb.py
similarity index 99%
rename from tests/unit/storage/test_impl_mongodb.py
rename to tests/unit/queues/storage/test_impl_mongodb.py
index b9f56f332..30d6b1d5e 100644
--- a/tests/unit/storage/test_impl_mongodb.py
+++ b/tests/unit/queues/storage/test_impl_mongodb.py
@@ -28,7 +28,7 @@ from marconi.queues.storage.mongodb import controllers
 from marconi.queues.storage.mongodb import options as mongodb_options
 from marconi.queues.storage.mongodb import utils
 from marconi import tests as testing
-from marconi.tests.storage import base
+from marconi.tests.queues.storage import base
 
 
 class MongodbUtilsTest(testing.TestBase):
diff --git a/tests/unit/storage/test_impl_sqlite.py b/tests/unit/queues/storage/test_impl_sqlite.py
similarity index 97%
rename from tests/unit/storage/test_impl_sqlite.py
rename to tests/unit/queues/storage/test_impl_sqlite.py
index 4745bb5c0..29b8b1a84 100644
--- a/tests/unit/storage/test_impl_sqlite.py
+++ b/tests/unit/queues/storage/test_impl_sqlite.py
@@ -16,7 +16,7 @@
 from marconi.queues import storage
 from marconi.queues.storage import sqlite
 from marconi.queues.storage.sqlite import controllers
-from marconi.tests.storage import base
+from marconi.tests.queues.storage import base
 
 
 class SQliteQueueTests(base.QueueControllerTest):
diff --git a/tests/unit/queues/transport/__init__.py b/tests/unit/queues/transport/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/unit/transport/test_auth.py b/tests/unit/queues/transport/test_auth.py
similarity index 100%
rename from tests/unit/transport/test_auth.py
rename to tests/unit/queues/transport/test_auth.py
diff --git a/tests/unit/queues/transport/wsgi/__init__.py b/tests/unit/queues/transport/wsgi/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/unit/transport/wsgi/base.py b/tests/unit/queues/transport/wsgi/base.py
similarity index 100%
rename from tests/unit/transport/wsgi/base.py
rename to tests/unit/queues/transport/wsgi/base.py
diff --git a/tests/unit/transport/wsgi/test_auth.py b/tests/unit/queues/transport/wsgi/test_auth.py
similarity index 100%
rename from tests/unit/transport/wsgi/test_auth.py
rename to tests/unit/queues/transport/wsgi/test_auth.py
diff --git a/tests/unit/transport/wsgi/test_claims.py b/tests/unit/queues/transport/wsgi/test_claims.py
similarity index 100%
rename from tests/unit/transport/wsgi/test_claims.py
rename to tests/unit/queues/transport/wsgi/test_claims.py
diff --git a/tests/unit/transport/wsgi/test_health.py b/tests/unit/queues/transport/wsgi/test_health.py
similarity index 100%
rename from tests/unit/transport/wsgi/test_health.py
rename to tests/unit/queues/transport/wsgi/test_health.py
diff --git a/tests/unit/transport/wsgi/test_home.py b/tests/unit/queues/transport/wsgi/test_home.py
similarity index 100%
rename from tests/unit/transport/wsgi/test_home.py
rename to tests/unit/queues/transport/wsgi/test_home.py
diff --git a/tests/unit/transport/wsgi/test_media_type.py b/tests/unit/queues/transport/wsgi/test_media_type.py
similarity index 100%
rename from tests/unit/transport/wsgi/test_media_type.py
rename to tests/unit/queues/transport/wsgi/test_media_type.py
diff --git a/tests/unit/transport/wsgi/test_messages.py b/tests/unit/queues/transport/wsgi/test_messages.py
similarity index 100%
rename from tests/unit/transport/wsgi/test_messages.py
rename to tests/unit/queues/transport/wsgi/test_messages.py
diff --git a/tests/unit/transport/wsgi/test_queue_lifecycle.py b/tests/unit/queues/transport/wsgi/test_queue_lifecycle.py
similarity index 100%
rename from tests/unit/transport/wsgi/test_queue_lifecycle.py
rename to tests/unit/queues/transport/wsgi/test_queue_lifecycle.py
diff --git a/tests/unit/transport/wsgi/test_utils.py b/tests/unit/queues/transport/wsgi/test_utils.py
similarity index 100%
rename from tests/unit/transport/wsgi/test_utils.py
rename to tests/unit/queues/transport/wsgi/test_utils.py
diff --git a/tests/unit/transport/wsgi/test_validation.py b/tests/unit/queues/transport/wsgi/test_validation.py
similarity index 100%
rename from tests/unit/transport/wsgi/test_validation.py
rename to tests/unit/queues/transport/wsgi/test_validation.py