diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8e81e4b7c54..6caa20e2f5e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -532,8 +532,6 @@ Code Checks + Clang Warnings:
     - ./tools/cppcheck/cppcheck.sh -l $NUM_COMMITS | tee cppcheck/cppcheck_report.txt
     - if [[ -s "cppcheck/cppcheck_report.txt" ]]; then ./tools/cppcheck/cppcheck.sh -l $NUM_COMMITS -x > cppcheck/cppcheck_report.xml ; fi
     - if [[ -s "cppcheck/cppcheck_report.txt" ]]; then cppcheck-htmlreport --file cppcheck/cppcheck_report.xml  --report-dir cppcheck ; fi
-    - ./tools/check_typed_item_calls.py --consecutive --label --mask --commits $NUM_COMMITS | tee item_calls_check.txt
-    - ./tools/check_tfs.py --commits $NUM_COMMITS | tee tfs_check.txt
     - cd build
     - printf "\e[0Ksection_start:%s:cmake_section[collapsed=true]\r\e[0KRunning CMake" "$( date +%s)"
     # We don't have an "All options" job, so build fuzzshark and tfshark here.
@@ -549,6 +547,9 @@ Code Checks + Clang Warnings:
     - ansi2html < ../tmp_clang_analyzer_check.txt > ../html/clang_analyzer_check.html
     - ninja checkAPI
     - ninja shellcheck
+    - cd ..
+    - ./tools/check_typed_item_calls.py --consecutive --label --mask --commits $NUM_COMMITS | tee item_calls_check.txt
+    - ./tools/check_tfs.py --commits $NUM_COMMITS | tee tfs_check.txt
   artifacts:
     paths:
       - clang_report.txt