diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c9701193541..aac91577c9f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,8 +38,6 @@ workflow:
         JOB_PRIORITY: 75
         # fast-fail in merge pipelines: stop early if we get this many unexpected fails/crashes
         DEQP_RUNNER_MAX_FAILS: 40
-        # Flag to advertise the CI scripts if we are in a merge pipeline
-        IS_MERGE_PIPELINE: 1
     # post-merge pipeline
     - if: &is-post-merge $GITLAB_USER_LOGIN == "marge-bot" && $CI_PIPELINE_SOURCE == "push"
     # Pre-merge pipeline
diff --git a/.gitlab-ci/common/generate-env.sh b/.gitlab-ci/common/generate-env.sh
index 63a96efe1fe..ea4d95e4d09 100755
--- a/.gitlab-ci/common/generate-env.sh
+++ b/.gitlab-ci/common/generate-env.sh
@@ -66,7 +66,6 @@ VARS=(
     HWCI_TEST_ARGS
     HWCI_TEST_SCRIPT
     IR3_SHADER_DEBUG
-    IS_MERGE_PIPELINE
     JOB_ARTIFACTS_BASE
     JOB_RESULTS_PATH
     JOB_ROOTFS_OVERLAY_PATH
diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh
index 1e683fb6319..46f03331429 100755
--- a/.gitlab-ci/deqp-runner.sh
+++ b/.gitlab-ci/deqp-runner.sh
@@ -123,7 +123,7 @@ if [ -e "$INSTALL/$GPU_VERSION-skips.txt" ]; then
     DEQP_SKIPS="$DEQP_SKIPS $INSTALL/$GPU_VERSION-skips.txt"
 fi
 
-if [ -e "$INSTALL/$GPU_VERSION-slow-skips.txt" ] && [ -n "${IS_MERGE_PIPELINE:-}" ]; then
+if [ -e "$INSTALL/$GPU_VERSION-slow-skips.txt" ] && [[ $CI_JOB_NAME != *full* ]]; then
     DEQP_SKIPS="$DEQP_SKIPS $INSTALL/$GPU_VERSION-slow-skips.txt"
 fi
 
diff --git a/.gitlab-ci/piglit/piglit-runner.sh b/.gitlab-ci/piglit/piglit-runner.sh
index 805e42655a3..7c7f565f1e9 100755
--- a/.gitlab-ci/piglit/piglit-runner.sh
+++ b/.gitlab-ci/piglit/piglit-runner.sh
@@ -78,7 +78,7 @@ if [ -e "$INSTALL/$GPU_VERSION-skips.txt" ]; then
     PIGLIT_SKIPS="$PIGLIT_SKIPS $INSTALL/$GPU_VERSION-skips.txt"
 fi
 
-if [ -e "$INSTALL/$GPU_VERSION-slow-skips.txt" ] && [ -n "${IS_MERGE_PIPELINE:-}" ]; then
+if [ -e "$INSTALL/$GPU_VERSION-slow-skips.txt" ] && [[ $CI_JOB_NAME != *full* ]]; then
     PIGLIT_SKIPS="$PIGLIT_SKIPS $INSTALL/$GPU_VERSION-slow-skips.txt"
 fi
 
diff --git a/src/amd/ci/radeonsi-raven-slow-skips.txt b/src/amd/ci/radeonsi-raven-slow-skips.txt
index 12482f8885a..aa6c52fe219 100644
--- a/src/amd/ci/radeonsi-raven-slow-skips.txt
+++ b/src/amd/ci/radeonsi-raven-slow-skips.txt
@@ -1,5 +1,5 @@
-# Skip tests from pre-merge pipelines, mainly because some tests extrapolate the 1 minute mark
-# Note that this not affect nightly jobs.
+# Skip tests, mainly because some tests exceed the 1 minute mark
+# Note that this not affect full jobs.
 
 glx@glx-buffer-age vblank_mode=0
 glx@glx_arb_sync_control@swapbuffersmsc-return swap_interval 1
diff --git a/src/gallium/drivers/zink/ci/zink-anv-adl-slow-skips.txt b/src/gallium/drivers/zink/ci/zink-anv-adl-slow-skips.txt
index 8563b5036d9..0259f0d06b0 100644
--- a/src/gallium/drivers/zink/ci/zink-anv-adl-slow-skips.txt
+++ b/src/gallium/drivers/zink/ci/zink-anv-adl-slow-skips.txt
@@ -1,4 +1,4 @@
-# Skip some >1min tests in pre merge.  These will be covered in the nightly jobs.
+# Skip some >1min tests.  These will be covered in the full jobs.
 KHR-GL46.packed_pixels.varied_rectangle.*
 KHR-GL46.tessellation_shader.tessellation_control_to_tessellation_evaluation.gl_MaxPatchVertices_Position_PointSize
 KHR-Single-GL46.arrays_of_arrays_gl.SizedDeclarationsPrimitive
diff --git a/src/gallium/drivers/zink/ci/zink-anv-tgl-slow-skips.txt b/src/gallium/drivers/zink/ci/zink-anv-tgl-slow-skips.txt
index 73e1c012e17..d9192ef79d3 100644
--- a/src/gallium/drivers/zink/ci/zink-anv-tgl-slow-skips.txt
+++ b/src/gallium/drivers/zink/ci/zink-anv-tgl-slow-skips.txt
@@ -1,4 +1,4 @@
-# Skip some >1min tests in pre merge.  These will be covered in the nightly jobs.
+# Skip some >1min tests.  These will be covered in the full jobs.
 KHR-GL46.packed_pixels.varied_rectangle.*
 KHR-GL46.tessellation_shader.tessellation_control_to_tessellation_evaluation.gl_MaxPatchVertices_Position_PointSize
 KHR-Single-GL46.arrays_of_arrays_gl.SizedDeclarationsPrimitive
diff --git a/src/intel/ci/anv-jsl-slow-skips.txt b/src/intel/ci/anv-jsl-slow-skips.txt
index 84fba1978b2..309d60ad40b 100644
--- a/src/intel/ci/anv-jsl-slow-skips.txt
+++ b/src/intel/ci/anv-jsl-slow-skips.txt
@@ -1,4 +1,4 @@
-# These are pretty slow, so just run the 2d cases in pre-merge.
+# These are pretty slow, so just run the 2d cases in non-"full" jobs.
 dEQP-VK.*robustness.*.no_fmt_qual.*samples_1.*_array.frag
 dEQP-VK.*robustness.*.no_fmt_qual.*samples_1.3d.frag
 dEQP-VK.*robustness.*.no_fmt_qual.*samples_1.cube.frag