diff --git a/tests/drivers/__init__.py b/tests/drivers/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/test_qpid.py b/tests/drivers/test_impl_qpid.py
similarity index 100%
rename from tests/test_qpid.py
rename to tests/drivers/test_impl_qpid.py
diff --git a/tests/test_rabbit.py b/tests/drivers/test_impl_rabbit.py
similarity index 100%
rename from tests/test_rabbit.py
rename to tests/drivers/test_impl_rabbit.py
diff --git a/tests/test_pool.py b/tests/drivers/test_pool.py
similarity index 100%
rename from tests/test_pool.py
rename to tests/drivers/test_pool.py