diff --git a/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe.toml b/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe.toml
index 2236ef94ce0..3871e2c9da8 100644
--- a/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe.toml
+++ b/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe.toml
@@ -55,3 +55,26 @@ deqp_args = [
     "--deqp-gl-config-name=rgba8888d24s8ms0",
     "--deqp-visibility=hidden"
 ]
+
+[[deqp]]
+deqp = "/deqp/modules/egl/deqp-egl"
+caselists = ["/deqp/mustpass/egl-master.txt"]
+deqp_args = [
+    "--deqp-surface-width=256",
+    "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+    "--deqp-visibility=hidden"
+]
+  [deqp.env]
+  # Stress test NIR clone/serialization for GLES3.1 (which should cover most of the featureset).
+  # Costs about 30% extra runtime.
+  NIR_DEBUG="clone,serialize"
+
+[[piglit]]
+piglit_folder = "/piglit"
+profile = "quick"
+process_isolation = true
+  [piglit.env]
+  # workaround for spec@arb_shader_texture_lod@execution@arb_shader_texture_lod-texgradcube
+  GALLIVM_PERF = "no_quad_lod"
diff --git a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml
index 221eabaf113..586a63ce5cf 100644
--- a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml
@@ -23,19 +23,6 @@ llvmpipe-piglit-cl:
   script:
     - install/piglit/run_cl.sh
 
-llvmpipe-piglit-gl:
-  extends:
-    - .test-gl
-    - .piglit-test
-    - .llvmpipe-test
-  parallel: 2
-  variables:
-    GALLIVM_PERF: "no_quad_lod"
-    LP_NUM_THREADS: 0
-    PIGLIT_PROFILES: quick
-  script:
-    - LD_LIBRARY_PATH=`pwd`/install xvfb-run --server-args='-noreset' install/piglit/piglit-runner.sh
-
 llvmpipe-traces:
   extends:
     - .test-gl
@@ -50,34 +37,30 @@ llvmpipe-traces:
 .llvmpipe-deqp-test:
   variables:
     GALLIVM_PERF: "nopt"
-    # Don't use threads inside llvmpipe, we've already got all cores
-    # busy at the deqp-runner level.
-    LP_NUM_THREADS: 0
   extends:
     - .test-gl
     - .deqp-test
     - .llvmpipe-test
 
-llvmpipe-deqp:
+llvmpipe:
+  tags:
+    - mesa-swrast
   variables:
     DEQP_SUITE: llvmpipe
-  parallel: 2
   extends: .llvmpipe-deqp-test
+  script:
+    - LD_LIBRARY_PATH=`pwd`/install xvfb-run --server-args='-noreset' install/deqp-runner.sh
 
 llvmpipe-deqp-asan:
   variables:
     DEQP_SUITE: llvmpipe-asan
     GPU_VERSION: llvmpipe-asan
     DEQP_FRACTION: 10
+    # Don't use threads inside llvmpipe, we've already got all cores
+    # busy at the deqp-runner level, and we don't want to overload fd.o
+    # shared runners
+    LP_NUM_THREADS: 0
   extends: .llvmpipe-deqp-test
   needs:
     - debian/x86_test-gl
     - debian-testing-asan
-
-llvmpipe-egl:
-  variables:
-    DEQP_VER: egl
-  extends:
-    - .llvmpipe-deqp-test
-  script:
-    - xvfb-run --server-args='-noreset' ./install/deqp-runner.sh
diff --git a/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt b/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt
index a680e51bc8d..6e9fb356550 100644
--- a/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt
+++ b/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt
@@ -115,7 +115,6 @@ spec@arb_shader_image_load_store@early-z,Fail
 spec@arb_shader_image_load_store@early-z@occlusion query test/early-z pass,Fail
 
 spec@arb_shader_texture_lod@execution@arb_shader_texture_lod-texgrad,Fail
-spec@arb_timer_query@query gl_timestamp,Fail
 spec@egl 1.4@egl-copy-buffers,Fail
 spec@egl_khr_gl_image@egl_khr_gl_renderbuffer_image-clear-shared-image gl_depth_component24,Fail
 
diff --git a/src/gallium/drivers/llvmpipe/ci/llvmpipe-flakes.txt b/src/gallium/drivers/llvmpipe/ci/llvmpipe-flakes.txt
index 468b0b53614..642d2e47e6c 100644
--- a/src/gallium/drivers/llvmpipe/ci/llvmpipe-flakes.txt
+++ b/src/gallium/drivers/llvmpipe/ci/llvmpipe-flakes.txt
@@ -1,3 +1,4 @@
+dEQP-EGL.functional.sharing.gles2.multithread.random.programs.link.7
 dEQP-EGL.functional.sharing.gles2.multithread.random.programs.link.19
 dEQP-EGL.functional.sharing.gles2.multithread.random_egl_sync.programs.link.7
 dEQP-EGL.functional.sharing.gles2.multithread.simple_egl_server_sync.programs.link
diff --git a/src/gallium/drivers/llvmpipe/ci/llvmpipe-skips.txt b/src/gallium/drivers/llvmpipe/ci/llvmpipe-skips.txt
index b23301f35af..f50b4c819af 100644
--- a/src/gallium/drivers/llvmpipe/ci/llvmpipe-skips.txt
+++ b/src/gallium/drivers/llvmpipe/ci/llvmpipe-skips.txt
@@ -29,3 +29,4 @@ longprim
 
 # Unreliable on shared runners due to timing
 ext_timer_query@time-elapsed
+spec@arb_timer_query@query gl_timestamp