diff --git a/tests/unit/queues/__init__.py b/tests/unit/queues/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/unit/transport/http/__init__.py b/tests/unit/queues/transport/__init__.py
similarity index 100%
rename from tests/unit/transport/http/__init__.py
rename to tests/unit/queues/transport/__init__.py
diff --git a/tests/unit/transport/zmq/__init__.py b/tests/unit/queues/transport/http/__init__.py
similarity index 100%
rename from tests/unit/transport/zmq/__init__.py
rename to tests/unit/queues/transport/http/__init__.py
diff --git a/tests/unit/transport/http/test_message.py b/tests/unit/queues/transport/http/test_message.py
similarity index 100%
rename from tests/unit/transport/http/test_message.py
rename to tests/unit/queues/transport/http/test_message.py
diff --git a/tests/unit/queues/transport/zmq/__init__.py b/tests/unit/queues/transport/zmq/__init__.py
new file mode 100644
index 00000000..78f982ce
--- /dev/null
+++ b/tests/unit/queues/transport/zmq/__init__.py
@@ -0,0 +1,14 @@
+# Copyright (c) 2013 Rackspace, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/tests/unit/transport/__init__.py b/tests/unit/transport/__init__.py
index 78f982ce..e69de29b 100644
--- a/tests/unit/transport/__init__.py
+++ b/tests/unit/transport/__init__.py
@@ -1,14 +0,0 @@
-# Copyright (c) 2013 Rackspace, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.