diff --git a/tests/notify/__init__.py b/tests/notify/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/test_notify_dispatcher.py b/tests/notify/test_dispatcher.py
similarity index 100%
rename from tests/test_notify_dispatcher.py
rename to tests/notify/test_dispatcher.py
diff --git a/tests/test_notify_listener.py b/tests/notify/test_listener.py
similarity index 100%
rename from tests/test_notify_listener.py
rename to tests/notify/test_listener.py
diff --git a/tests/test_log_handler.py b/tests/notify/test_log_handler.py
similarity index 98%
rename from tests/test_log_handler.py
rename to tests/notify/test_log_handler.py
index ef1e089ea..8e5d55f18 100644
--- a/tests/test_log_handler.py
+++ b/tests/notify/test_log_handler.py
@@ -15,7 +15,7 @@ import mock
 
 from oslo import messaging
 from oslo.messaging.notify import log_handler
-from tests import test_notifier
+from tests.notify import test_notifier
 from tests import utils as test_utils
 
 
diff --git a/tests/test_notifier_logger.py b/tests/notify/test_logger.py
similarity index 99%
rename from tests/test_notifier_logger.py
rename to tests/notify/test_logger.py
index ac4a77058..cb4fb2a72 100644
--- a/tests/test_notifier_logger.py
+++ b/tests/notify/test_logger.py
@@ -28,7 +28,7 @@ import testtools
 
 from oslo import messaging
 from oslo.messaging.openstack.common import timeutils
-from tests import test_notifier
+from tests.notify import test_notifier
 from tests import utils as test_utils
 
 
diff --git a/tests/test_notifier.py b/tests/notify/test_notifier.py
similarity index 100%
rename from tests/test_notifier.py
rename to tests/notify/test_notifier.py