diff --git a/.gitlab-ci/piglit/piglit-all-skips.txt b/.gitlab-ci/piglit/piglit-all-skips.txt
new file mode 100644
index 00000000000..7c802d9f526
--- /dev/null
+++ b/.gitlab-ci/piglit/piglit-all-skips.txt
@@ -0,0 +1,2 @@
+# WGL is Windows-only
+wgl@.*
diff --git a/.gitlab-ci/piglit/piglit-runner.sh b/.gitlab-ci/piglit/piglit-runner.sh
index 7b86a0d3fd8..decb6888e0a 100755
--- a/.gitlab-ci/piglit/piglit-runner.sh
+++ b/.gitlab-ci/piglit/piglit-runner.sh
@@ -36,7 +36,7 @@ fi
 touch $INSTALL/piglit-$GPU_VERSION-flakes.txt
 
 if [ -e "$INSTALL/piglit-$GPU_VERSION-skips.txt" ]; then
-    PIGLIT_RUNNER_OPTIONS="$PIGLIT_RUNNER_OPTIONS --skips $INSTALL/piglit-$GPU_VERSION-skips.txt"
+    PIGLIT_SKIPS="$INSTALL/piglit-$GPU_VERSION-skips.txt"
 fi
 
 set +e
@@ -58,6 +58,7 @@ export LD_PRELOAD=$TEST_LD_PRELOAD
         run \
         --piglit-folder /piglit \
         --output $RESULTS \
+        --skips $INSTALL/piglit/piglit-all-skips.txt $PIGLIT_SKIPS \
         --flakes $INSTALL/piglit-$GPU_VERSION-flakes.txt \
         --profile $PIGLIT_PROFILES \
         --process-isolation \
diff --git a/src/broadcom/ci/piglit-v3d-rpi4-skips.txt b/src/broadcom/ci/piglit-v3d-rpi4-skips.txt
index 1cca5568e3f..2c70ff30c3f 100644
--- a/src/broadcom/ci/piglit-v3d-rpi4-skips.txt
+++ b/src/broadcom/ci/piglit-v3d-rpi4-skips.txt
@@ -18,6 +18,3 @@ spec@glsl-1.50.*
 spec@glsl-3.*
 spec@glsl-4.*
 spec@glsl-es-3.20.*
-
-# WGL is Windows-only
-wgl@.*
diff --git a/src/broadcom/ci/piglit-vc4-rpi3-skips.txt b/src/broadcom/ci/piglit-vc4-rpi3-skips.txt
index 933eb13032f..ae25a28bb9a 100644
--- a/src/broadcom/ci/piglit-vc4-rpi3-skips.txt
+++ b/src/broadcom/ci/piglit-vc4-rpi3-skips.txt
@@ -17,6 +17,3 @@ spec@glsl-1.50.*
 spec@glsl-3.*
 spec@glsl-4.*
 spec@glsl-es-3.*
-
-# WGL is Windows-only
-wgl@.*
diff --git a/src/gallium/drivers/freedreno/ci/piglit-freedreno-a530-skips.txt b/src/gallium/drivers/freedreno/ci/piglit-freedreno-a530-skips.txt
index 1e32f6e8039..df745e436d0 100644
--- a/src/gallium/drivers/freedreno/ci/piglit-freedreno-a530-skips.txt
+++ b/src/gallium/drivers/freedreno/ci/piglit-freedreno-a530-skips.txt
@@ -33,6 +33,3 @@ spec@arb_pixel_buffer_object@texsubimage cube_map_array pbo
 # Causes faults that need the HUPCF fix to actually work to avoid killing the
 # run.
 spec@glsl-1.30@execution@texelfetch fs sampler3d 98x1x9-98x129x9
-
-# WGL is Windows-only
-wgl@.*
diff --git a/src/gallium/drivers/freedreno/ci/piglit-freedreno-a630-skips.txt b/src/gallium/drivers/freedreno/ci/piglit-freedreno-a630-skips.txt
index fd177ce390c..00a2b35f5a0 100644
--- a/src/gallium/drivers/freedreno/ci/piglit-freedreno-a630-skips.txt
+++ b/src/gallium/drivers/freedreno/ci/piglit-freedreno-a630-skips.txt
@@ -31,6 +31,3 @@ spec@arb_buffer_storage@bufferstorage-persistent_gles3 read
 spec@arb_buffer_storage@bufferstorage-persistent_gles3 read client-storage
 spec@arb_buffer_storage@bufferstorage-persistent_gles3 read coherent
 spec@arb_buffer_storage@bufferstorage-persistent_gles3 read coherent client-storage
-
-# WGL is Windows-only
-wgl@.*
diff --git a/src/gallium/drivers/i915/ci/piglit-i915-g33-skips.txt b/src/gallium/drivers/i915/ci/piglit-i915-g33-skips.txt
index 6279a3d5218..b125d8a03be 100644
--- a/src/gallium/drivers/i915/ci/piglit-i915-g33-skips.txt
+++ b/src/gallium/drivers/i915/ci/piglit-i915-g33-skips.txt
@@ -1,6 +1,3 @@
 # Timeout
 spec@arb_internalformat_query2@all internalformat_.*_type
 spec@!opengl 1.0@gl-1.0-blend-func
-
-# WGL is Windows-only
-wgl@.*
diff --git a/src/gallium/drivers/radeonsi/ci/piglit-radeonsi-stoney-skips.txt b/src/gallium/drivers/radeonsi/ci/piglit-radeonsi-stoney-skips.txt
index 6c8b715095d..a5243eac0a3 100644
--- a/src/gallium/drivers/radeonsi/ci/piglit-radeonsi-stoney-skips.txt
+++ b/src/gallium/drivers/radeonsi/ci/piglit-radeonsi-stoney-skips.txt
@@ -29,6 +29,3 @@ spec@ext_external_objects_fd@semaphore-api-errors
 spec@ext_external_objects_fd@memory-object-api-errors
 spec@ext_external_objects@vk-vert-buf-reuse
 glx@glx-swap-copy
-
-# WGL is Windows-only
-wgl@.*
diff --git a/src/gallium/drivers/zink/ci/piglit-zink-lvp-skips.txt b/src/gallium/drivers/zink/ci/piglit-zink-lvp-skips.txt
index d467d950b5e..a5ce1b08bd0 100644
--- a/src/gallium/drivers/zink/ci/piglit-zink-lvp-skips.txt
+++ b/src/gallium/drivers/zink/ci/piglit-zink-lvp-skips.txt
@@ -12,9 +12,6 @@ spec@glsl-1.30@execution@tex-miplevel-selection.*
 # only supported if Piglit is using GLUT
 spec@!opengl 1.1@windowoverlap
 
-# WGL is Windows-only
-wgl@.*
-
 # This test doesn't even seem to exist, but piglit adds it to a group...?
 spec@arb_vertex_type_2_10_10_10_rev@attrib-p-type-size-match