diff --git a/.github/workflows/mac-continuous.yml b/.github/workflows/mac-continuous.yml
index b7c98c93b1..f1da1045b3 100644
--- a/.github/workflows/mac-continuous.yml
+++ b/.github/workflows/mac-continuous.yml
@@ -26,4 +26,4 @@ jobs:
           path: out/filament-release-darwin.tgz
       - name: Check public headers
         run: |
-          build/common/check-headers.sh out/release/filament/include
+          test/check-headers/test.sh out/release/filament/include
diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index f9b738f154..280fca8293 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -131,7 +131,7 @@ jobs:
       - name: Prerequisites
         id: prereqs
         run: |
-          bash test/utils/get_mesa.sh
+          bash build/common/get-mesa.sh
           pip install tifffile numpy
       - name: Run Test
         run: bash test/renderdiff/test.sh
@@ -153,8 +153,8 @@ jobs:
       - name: Run test
         run: ./out/cmake-debug/libs/filamat/test_filamat --gtest_filter=MaterialCompiler.Wgsl*
 
-  code-correctness:
-    name: code-correctness
+  test-code-correctness:
+    name: test-code-correctness
     runs-on: 'macos-14-xlarge'
     steps:
       - uses: actions/checkout@v4.1.6
diff --git a/test/utils/get_mesa.sh b/build/common/get-mesa.sh
similarity index 100%
rename from test/utils/get_mesa.sh
rename to build/common/get-mesa.sh
diff --git a/build/common/check-headers.sh b/test/check-headers/test.sh
similarity index 100%
rename from build/common/check-headers.sh
rename to test/check-headers/test.sh
diff --git a/build/common/check-metal-shaders.sh b/test/check-metal-shaders/test.sh
similarity index 100%
rename from build/common/check-metal-shaders.sh
rename to test/check-metal-shaders/test.sh
diff --git a/test/renderdiff/test.sh b/test/renderdiff/test.sh
index 6a53bc039c..726b3e9965 100755
--- a/test/renderdiff/test.sh
+++ b/test/renderdiff/test.sh
@@ -16,7 +16,7 @@
 
 OUTPUT_DIR="$(pwd)/out/renderdiff_tests"
 RENDERDIFF_TEST_DIR="$(pwd)/test/renderdiff"
-TEST_UTILS_DIR="$(pwd)/test/utils"
+BUILD_COMMON_DIR="$(pwd)/build/common"
 MESA_DIR="$(pwd)/mesa/out/"
 VENV_DIR="$(pwd)/venv"
 
@@ -35,7 +35,7 @@ function start_() {
         set -ex
     else
         if [ ! -d ${MESA_LIB_DIR} ]; then
-            bash ${TEST_UTILS_DIR}/get_mesa.sh
+            bash ${BUILD_COMMON_DIR}/get-mesa.sh
         fi
 
         # Install python deps