diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ad39ebd38e..0548ab0932 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -557,7 +557,7 @@ stages:
     - cd "$CI_PROJECT_DIR"
     - *find_python
     - >
-      "$PYTHON" bin/tests/convert-trs-to-junit.py . > "$CI_PROJECT_DIR"/junit_system.xml
+      "$PYTHON" bin/tests/convert_trs_to_junit.py . > "$CI_PROJECT_DIR"/junit_system.xml
     - *git_clone_bind9-qa
     - >
       "$PYTHON" "$CI_PROJECT_DIR"/bind9-qa/ci/postprocess_junit_files.py "$CI_PROJECT_DIR"/junit_system.xml --output "$CI_PROJECT_DIR"/junit.xml
@@ -586,9 +586,9 @@ stages:
     - RET=0
     - make -j${TEST_PARALLEL_JOBS:-1} -k unit V=1 || RET=$?
     - *find_python
-    - >
-      "$PYTHON" "$CI_PROJECT_DIR"/bin/tests/convert-trs-to-junit.py . > "$CI_PROJECT_DIR"/junit_unit.xml
     - *git_clone_bind9-qa
+    - >
+      "$PYTHON" "$CI_PROJECT_DIR"/bin/tests/convert_trs_to_junit.py . > "$CI_PROJECT_DIR"/junit_unit.xml
     - >
       "$PYTHON" "$CI_PROJECT_DIR"/bind9-qa/ci/postprocess_junit_files.py "$CI_PROJECT_DIR"/junit_unit.xml --output "$CI_PROJECT_DIR"/junit.xml
     - (exit $RET)
diff --git a/bin/tests/Makefile.am b/bin/tests/Makefile.am
index 56e81b118a..2dd2067ba6 100644
--- a/bin/tests/Makefile.am
+++ b/bin/tests/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.top
 
-EXTRA_DIST = convert-trs-to-junit.py
+EXTRA_DIST = convert_trs_to_junit.py
 
 SUBDIRS = system
 
diff --git a/bin/tests/convert-trs-to-junit.py b/bin/tests/convert_trs_to_junit.py
similarity index 100%
rename from bin/tests/convert-trs-to-junit.py
rename to bin/tests/convert_trs_to_junit.py
diff --git a/bin/tests/system/convert-junit-to-trs.py b/bin/tests/system/convert_junit_to_trs.py
similarity index 96%
rename from bin/tests/system/convert-junit-to-trs.py
rename to bin/tests/system/convert_junit_to_trs.py
index 9675825a50..60142d958a 100755
--- a/bin/tests/system/convert-junit-to-trs.py
+++ b/bin/tests/system/convert_junit_to_trs.py
@@ -16,7 +16,7 @@ def junit_to_trs(junit_xml):
     testcases = root.findall(".//testcase")
 
     if len(testcases) < 1:
-        print(":test-result: ERROR convert-junit-to-trs.py")
+        print(":test-result: ERROR convert_junit_to_trs.py")
         return 99
 
     has_fail = False
diff --git a/bin/tests/system/custom-test-driver b/bin/tests/system/custom-test-driver
index 278cb377e2..a2f76910b1 100755
--- a/bin/tests/system/custom-test-driver
+++ b/bin/tests/system/custom-test-driver
@@ -146,7 +146,7 @@ else
 fi
 
 # Run junit to trs converter script.
-./convert-junit-to-trs.py $junit_file >$trs_file
+./convert_junit_to_trs.py $junit_file >$trs_file
 estatus=$?
 
 if test $enable_hard_errors = no && test $estatus -eq 99; then
diff --git a/bin/tests/system/rndc/tests_cve-2023-3341.py b/bin/tests/system/rndc/tests_cve_2023_3341.py
similarity index 100%
rename from bin/tests/system/rndc/tests_cve-2023-3341.py
rename to bin/tests/system/rndc/tests_cve_2023_3341.py