diff --git a/tests/test_app.py b/tests/test_engine_app.py similarity index 100% rename from tests/test_app.py rename to tests/test_engine_app.py diff --git a/tests/test_channels.py b/tests/test_engine_channels.py similarity index 100% rename from tests/test_channels.py rename to tests/test_engine_channels.py diff --git a/tests/test_clock_handler.py b/tests/test_engine_clock_handler.py similarity index 100% rename from tests/test_clock_handler.py rename to tests/test_engine_clock_handler.py diff --git a/tests/test_config.py b/tests/test_engine_config.py similarity index 100% rename from tests/test_config.py rename to tests/test_engine_config.py diff --git a/tests/test_liquidsoap_util.py b/tests/test_engine_liquidsoap_util.py similarity index 100% rename from tests/test_liquidsoap_util.py rename to tests/test_engine_liquidsoap_util.py diff --git a/tests/test_logger.py b/tests/test_engine_logger.py similarity index 100% rename from tests/test_logger.py rename to tests/test_engine_logger.py diff --git a/tests/test_monitor.py b/tests/test_engine_monitor.py similarity index 100% rename from tests/test_monitor.py rename to tests/test_engine_monitor.py diff --git a/tests/test_domain.py b/tests/test_scheduling_domain.py similarity index 100% rename from tests/test_domain.py rename to tests/test_scheduling_domain.py