diff --git a/Makefile b/Makefile
index 110e0d4f..39c3d99b 100644
--- a/Makefile
+++ b/Makefile
@@ -211,5 +211,5 @@ help-general:
 .EXPORT_ALL_VARIABLES:
 .PHONY: all test man
 
-include docker.mk
+include docker/docker.mk
 include locales/i18n.mk
diff --git a/docker.mk b/docker/docker.mk
similarity index 100%
rename from docker.mk
rename to docker/docker.mk
diff --git a/docker/test_ubuntu2204.dockerfile.in b/docker/test_ubuntu2204.dockerfile.in
index 2e567f11..a267ba4b 100644
--- a/docker/test_ubuntu2204.dockerfile.in
+++ b/docker/test_ubuntu2204.dockerfile.in
@@ -14,7 +14,7 @@ ADD README.md /usr/src/@UTIL_NAME@/README.md
 ADD LICENSE /usr/src/@UTIL_NAME@/LICENSE
 ADD Makefile /usr/src/@UTIL_NAME@/Makefile
 ADD locales/ /usr/src/@UTIL_NAME@/locales
-ADD docker.mk /usr/src/@UTIL_NAME@/docker.mk
+ADD docker/docker.mk /usr/src/@UTIL_NAME@/docker/docker.mk
 ADD debian/ /usr/src/@UTIL_NAME@/debian
 
 CMD make test
diff --git a/docker/ubuntu2204.dockerfile.in b/docker/ubuntu2204.dockerfile.in
index d4270056..9ab8cf54 100644
--- a/docker/ubuntu2204.dockerfile.in
+++ b/docker/ubuntu2204.dockerfile.in
@@ -7,7 +7,7 @@ ADD README.md /usr/src/@UTIL_NAME@/README.md
 ADD LICENSE /usr/src/@UTIL_NAME@/LICENSE
 ADD Makefile /usr/src/@UTIL_NAME@/Makefile
 ADD locales/i18n.mk /usr/src/@UTIL_NAME@/locales/i18n.mk
-ADD docker.mk /usr/src/@UTIL_NAME@/docker.mk
+ADD docker/docker.mk /usr/src/@UTIL_NAME@/docker/docker.mk
 ADD @DEBIAN_PACKAGES_PATH@ /usr/src/@UTIL_NAME@/@DEBIAN_PACKAGES_PATH@
 
 RUN apt-get install -y /usr/src/@UTIL_NAME@/@DEBIAN_PACKAGES_PATH@/@DEB_PKG_NAME@.deb
diff --git a/test/auto/conftest.py b/test/auto/conftest.py
index 98d5f80c..1f655f45 100644
--- a/test/auto/conftest.py
+++ b/test/auto/conftest.py
@@ -9,26 +9,32 @@
 
 @pytest.fixture
 def create_reports_folder():
-    with suppress(Exception):
-        os.mkdir(REPORTS_FOLDER)
-    assert os.path.exists(REPORTS_FOLDER)
+    __create_reports_folder()
 
     yield
 
-    shutil.rmtree(REPORTS_FOLDER)
+    __remove_reports_folder()
 
 
 @pytest.fixture(scope="module")
 def create_reports_folder_module():
-    with suppress(Exception):
-        os.mkdir(REPORTS_FOLDER)
-    assert os.path.exists(REPORTS_FOLDER)
+    __create_reports_folder()
 
     yield
 
-    shutil.rmtree(REPORTS_FOLDER)
+    __remove_reports_folder()
 
 
 @pytest.fixture(scope="session", autouse=True)
 def set_logging_level():
     modify_settings(log_level="debug")
+
+
+def __create_reports_folder() -> None:
+    with suppress(Exception):
+        os.mkdir(REPORTS_FOLDER)
+    assert os.path.exists(REPORTS_FOLDER)
+
+
+def __remove_reports_folder() -> None:
+    shutil.rmtree(REPORTS_FOLDER)
diff --git a/test/auto/functional/test_check.py b/test/auto/functional/test_check.py
index 80e80bea..f5e15cba 100644
--- a/test/auto/functional/test_check.py
+++ b/test/auto/functional/test_check.py
@@ -78,7 +78,7 @@ def test_compare_cpp_files(cmd: list[str], out: bytes, found_plag: bool):
     result = run_check(cmd, extension="cpp")
 
     if found_plag:
-        result.assert_found_plagiarism()
+        result.assert_found_similarity()
     else:
         result.assert_success()
     assert out in result.cmd_res.stdout
@@ -119,7 +119,7 @@ def test_compare_py_files(cmd: list[str], out: bytes, found_plag: bool):
     result = run_check(cmd)
 
     if found_plag:
-        result.assert_found_plagiarism()
+        result.assert_found_similarity()
     else:
         result.assert_success()
     assert out in result.cmd_res.stdout
diff --git a/test/auto/functional/test_report.py b/test/auto/functional/test_report.py
index 62c200d5..3fb9ff2d 100644
--- a/test/auto/functional/test_report.py
+++ b/test/auto/functional/test_report.py
@@ -14,7 +14,7 @@ def setup(create_reports_folder_module: None):
     modify_settings(
         reports=REPORTS_FOLDER, reports_extension="csv", short_output=1
     ).assert_success()
-    run_check(["--directories", "test/unit/codeplag/cplag", "src/"]).assert_found_plagiarism()
+    run_check(["--directories", "test/unit/codeplag/cplag", "src/"]).assert_found_similarity()
 
     yield
 
diff --git a/test/auto/utils.py b/test/auto/utils.py
index eee032c0..da4a849b 100644
--- a/test/auto/utils.py
+++ b/test/auto/utils.py
@@ -28,7 +28,7 @@ def assert_success(self: Self) -> None:
     def assert_failed(self: Self) -> None:
         assert self.cmd_res.returncode, str(self.cmd_res)
 
-    def assert_found_plagiarism(self: Self) -> None:
+    def assert_found_similarity(self: Self) -> None:
         assert self.cmd_res.returncode == ExitCode.EXIT_FOUND_SIM, str(self.cmd_res)