diff --git a/.gitlab-ci/all-skips.txt b/.gitlab-ci/all-skips.txt
index 519f5ee1ea4..328f7e3c986 100644
--- a/.gitlab-ci/all-skips.txt
+++ b/.gitlab-ci/all-skips.txt
@@ -90,3 +90,26 @@ dEQP-VK.api.version_check.unavailable_entry_points
 spec@arb_program_interface_query@arb_program_interface_query-getprogramresourceindex
 spec@arb_program_interface_query@arb_program_interface_query-getprogramresourceindex@'vs_input2[1][0]' on GL_PROGRAM_INPUT
 
+# These tests attempt to read from the front buffer after a swap. They are skipped
+# on both X11 and gbm, but for different reasons:
+#
+# On X11: Given that we run piglit tests in parallel in Mesa CI, and don't have a
+# compositor running, the frontbuffer reads may end up with undefined results from
+# windows overlapping us.
+# Piglit does mark these tests as not to be run in parallel, but deqp-runner
+# doesn't respect that.  We need to extend deqp-runner to allow some tests to be
+# marked as single-threaded and run after the rayon loop if we want to support
+# them.
+# Other front-buffer access tests like fbo-sys-blit, fbo-sys-sub-blit, or
+# fcc-front-buffer-distraction don't appear here, because the DRI3 fake-front
+# handling should be holding the pixels drawn by the test even if we happen to fail
+# GL's window system pixel occlusion test.
+# Note that glx skips don't appear here, they're in all-skips.txt (in case someone
+# sets PIGLIT_PLATFORM=gbm to mostly use gbm, but still has an X server running).
+#
+# On gbm: gbm does not support reading the front buffer after a swapbuffers, and
+# that's intentional. Don't bother running these tests when PIGLIT_PLATFORM=gbm.
+# Note that this doesn't include tests like fbo-sys-blit, which draw/read front
+# but don't swap.
+spec@!opengl 1.0@gl-1.0-swapbuffers-behavior
+spec@!opengl 1.1@read-front
diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh
index a1e8ef87e29..abe727d28d2 100755
--- a/.gitlab-ci/deqp-runner.sh
+++ b/.gitlab-ci/deqp-runner.sh
@@ -69,14 +69,6 @@ if [ -e "$INSTALL/$GPU_VERSION-slow-skips.txt" ] && [[ $CI_JOB_NAME != *full* ]]
     DEQP_SKIPS="$DEQP_SKIPS $INSTALL/$GPU_VERSION-slow-skips.txt"
 fi
 
-if [ "$PIGLIT_PLATFORM" != "gbm" ] ; then
-    DEQP_SKIPS="$DEQP_SKIPS $INSTALL/x11-skips.txt"
-fi
-
-if [ "$PIGLIT_PLATFORM" = "gbm" ]; then
-    DEQP_SKIPS="$DEQP_SKIPS $INSTALL/gbm-skips.txt"
-fi
-
 if [ -n "$ANGLE_TAG" ]; then
     DEQP_SKIPS="$DEQP_SKIPS $INSTALL/angle-skips.txt"
 fi
diff --git a/.gitlab-ci/gbm-skips.txt b/.gitlab-ci/gbm-skips.txt
deleted file mode 100644
index 9067df7e8f5..00000000000
--- a/.gitlab-ci/gbm-skips.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# gbm does not support reading the front buffer after a swapbuffers, and that's
-# intentional. Don't bother running these tests when PIGLIT_PLATFORM=gbm.
-#
-# Note that this doesn't include tests like fbo-sys-blit, which draw/read front
-# but don't swap.
-spec@!opengl 1.0@gl-1.0-swapbuffers-behavior
-spec@!opengl 1.1@read-front
diff --git a/.gitlab-ci/x11-skips.txt b/.gitlab-ci/x11-skips.txt
deleted file mode 100644
index 957f8b7c95f..00000000000
--- a/.gitlab-ci/x11-skips.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-# These tests all read from the front buffer after a swap.  Given that we
-# run piglit tests in parallel in Mesa CI, and don't have a compositor
-# running, the frontbuffer reads may end up with undefined results from
-# windows overlapping us.
-#
-# Piglit does mark these tests as not to be run in parallel, but deqp-runner
-# doesn't respect that.  We need to extend deqp-runner to allow some tests to be
-# marked as single-threaded and run after the rayon loop if we want to support
-# them.
-#
-# Other front-buffer access tests like fbo-sys-blit, fbo-sys-sub-blit, or
-# fcc-front-buffer-distraction don't appear here, because the DRI3 fake-front
-# handling should be holding the pixels drawn by the test even if we happen to fail
-# GL's window system pixel occlusion test.
-#
-# Note that glx skips don't appear here, they're in all-skips.txt (in case someone
-# sets PIGLIT_PLATFORM=gbm to mostly use gbm, but still has an X server running).
-spec@!opengl 1.0@gl-1.0-swapbuffers-behavior
-spec@!opengl 1.1@read-front