diff --git a/.gitlab-ci/bare-metal/cros-servo.sh b/.gitlab-ci/bare-metal/cros-servo.sh
index a69d69b4ef2..327b8b9fd51 100755
--- a/.gitlab-ci/bare-metal/cros-servo.sh
+++ b/.gitlab-ci/bare-metal/cros-servo.sh
@@ -107,7 +107,7 @@ python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --update-dut-time su
 python3 $BM/cros_servo_run.py \
         --cpu $BM_SERIAL \
         --ec $BM_SERIAL_EC \
-        --test-timeout ${TEST_PHASE_TIMEOUT:-20}
+        --test-timeout ${TEST_PHASE_TIMEOUT_MINUTES:-20}
 ret=$?
 python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --close-dut-job
 python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --close
diff --git a/.gitlab-ci/bare-metal/fastboot.sh b/.gitlab-ci/bare-metal/fastboot.sh
index 6d19aa4f9e6..6c795a00c23 100755
--- a/.gitlab-ci/bare-metal/fastboot.sh
+++ b/.gitlab-ci/bare-metal/fastboot.sh
@@ -151,7 +151,7 @@ fi
 set +e
 $BM/fastboot_run.py \
   --dev="$BM_SERIAL" \
-  --test-timeout ${TEST_PHASE_TIMEOUT:-20} \
+  --test-timeout ${TEST_PHASE_TIMEOUT_MINUTES:-20} \
   --fbserial="$BM_FASTBOOT_SERIAL" \
   --powerup="$BM_POWERUP" \
   --powerdown="$BM_POWERDOWN"
diff --git a/src/etnaviv/ci/gitlab-ci.yml b/src/etnaviv/ci/gitlab-ci.yml
index 42e16a253ce..210f0b30dd7 100644
--- a/src/etnaviv/ci/gitlab-ci.yml
+++ b/src/etnaviv/ci/gitlab-ci.yml
@@ -86,7 +86,7 @@ gc2000_piglit:
   variables:
     DEQP_SUITE: etnaviv-gc2000-piglit
     FLAKES_CHANNEL: "#etnaviv-ci"
-    TEST_PHASE_TIMEOUT: 40
+    TEST_PHASE_TIMEOUT_MINUTES: 40
   timeout: 40m
 
 gc7000_gles2:
diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml
index 2c22dffebd9..f86ebd0da54 100644
--- a/src/freedreno/ci/gitlab-ci.yml
+++ b/src/freedreno/ci/gitlab-ci.yml
@@ -20,7 +20,7 @@ a306_piglit:
     DEQP_SUITE: freedreno-a306-piglit
     HWCI_START_WESTON: 1
     JOB_TIMEOUT: 40
-    TEST_PHASE_TIMEOUT: 40
+    TEST_PHASE_TIMEOUT_MINUTES: 40
 
 # Something happened and now this hangchecks and doesn't recover.  Unkown when
 # it started.
@@ -95,7 +95,7 @@ a618_vk_full:
     FDO_CI_CONCURRENT: 4
     DEQP_SUITE: freedreno-a618-vk-full
     JOB_TIMEOUT: 180
-    TEST_PHASE_TIMEOUT: 180
+    TEST_PHASE_TIMEOUT_MINUTES: 180
 
 a618_gl:
   extends:
@@ -156,7 +156,7 @@ a618_piglit_full:
     FLAKES_CHANNEL: "#freedreno-ci"
     HWCI_START_WESTON: 1
     JOB_TIMEOUT: 60
-    TEST_PHASE_TIMEOUT: 60
+    TEST_PHASE_TIMEOUT_MINUTES: 60
 
 a618-traces:
   extends:
@@ -265,7 +265,7 @@ a630_vk:
   parallel: 2
   variables:
     DEQP_SUITE: freedreno-a630-vk-full
-    TEST_PHASE_TIMEOUT: 180
+    TEST_PHASE_TIMEOUT_MINUTES: 180
 
 a630_vk_asan:
   extends:
@@ -298,7 +298,7 @@ a630_piglit_full:
   variables:
     HWCI_START_WESTON: 1
     DEQP_SUITE: freedreno-a630-piglit-full
-    TEST_PHASE_TIMEOUT: 60
+    TEST_PHASE_TIMEOUT_MINUTES: 60
 
 a630-traces:
   extends: