diff --git a/tests/gems/arch/arch_data_mapper_test.py b/tests/gems/arch/test_arch_data_mapper.py
similarity index 100%
rename from tests/gems/arch/arch_data_mapper_test.py
rename to tests/gems/arch/test_arch_data_mapper.py
diff --git a/tests/gems/arch/controller.py b/tests/gems/arch/test_controller.py
similarity index 100%
rename from tests/gems/arch/controller.py
rename to tests/gems/arch/test_controller.py
diff --git a/tests/gems/arch/pacman_test.py b/tests/gems/arch/test_pacman.py
similarity index 100%
rename from tests/gems/arch/pacman_test.py
rename to tests/gems/arch/test_pacman.py
diff --git a/tests/gems/flatpak/controller.py b/tests/gems/flatpak/test_controller.py
similarity index 100%
rename from tests/gems/flatpak/controller.py
rename to tests/gems/flatpak/test_controller.py
diff --git a/tests/gems/flatpak/worker_test.py b/tests/gems/flatpak/test_worker.py
similarity index 100%
rename from tests/gems/flatpak/worker_test.py
rename to tests/gems/flatpak/test_worker.py