diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh
index d489863658f..ddd78db1af2 100755
--- a/.gitlab-ci/deqp-runner.sh
+++ b/.gitlab-ci/deqp-runner.sh
@@ -47,7 +47,7 @@ mkdir -p $RESULTS
 if [ "$DEQP_VER" = "vk" ]; then
    cp /deqp/mustpass/vk-$DEQP_VARIANT.txt /tmp/case-list.txt
    DEQP=/deqp/external/vulkancts/modules/vulkan/deqp-vk
-elif [ "$DEQP_VER" = "gles2" -o "$DEQP_VER" = "gles3" -o "$DEQP_VER" = "gles31" ]; then
+elif [ "$DEQP_VER" = "gles2" -o "$DEQP_VER" = "gles3" -o "$DEQP_VER" = "gles31" -o "$DEQP_VER" = "egl" ]; then
    cp /deqp/mustpass/$DEQP_VER-$DEQP_VARIANT.txt /tmp/case-list.txt
    DEQP=/deqp/modules/$DEQP_VER/deqp-$DEQP_VER
    SUITE=dEQP
@@ -181,6 +181,9 @@ parse_renderer() {
 }
 
 check_renderer() {
+    if echo $DEQP_VER | grep -q egl; then
+        return
+    fi
     echo "Capturing renderer info for GLES driver sanity checks"
     # If you're having trouble loading your driver, uncommenting this may help
     # debug.
diff --git a/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-fails.txt b/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-fails.txt
index 5c92cf1fdcf..3b9f76a0225 100644
--- a/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-fails.txt
+++ b/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-fails.txt
@@ -1,3 +1,13 @@
+dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.query_status.compute,Fail
+dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.query_status.fragment,Timeout
+dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.query_status.vertex,Fail
+dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.query_status.vertex_and_fragment,Fail
+dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.reset_status.compute,Fail
+dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.reset_status.vertex,Fail
+dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.reset_status.vertex_and_fragment,Fail
+dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.sync_status.compute,Fail
+dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.sync_status.vertex,Fail
+dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.sync_status.vertex_and_fragment,Fail
 dEQP-GLES2.functional.clipping.line.wide_line_clip_viewport_center,Fail
 dEQP-GLES2.functional.clipping.line.wide_line_clip_viewport_corner,Fail
 dEQP-GLES2.functional.clipping.point.wide_point_clip,Fail
diff --git a/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-flakes.txt b/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-flakes.txt
new file mode 100644
index 00000000000..b582f84289c
--- /dev/null
+++ b/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-flakes.txt
@@ -0,0 +1,4 @@
+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
+dEQP-EGL.functional.sharing.gles2.multithread.simple_egl_sync.programs.link
diff --git a/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-skips.txt b/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-skips.txt
new file mode 100644
index 00000000000..919241dc46d
--- /dev/null
+++ b/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-skips.txt
@@ -0,0 +1,6 @@
+# Times out after a minute.
+dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.query_status.fragment
+dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.recover_from_reset.fragment
+dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.reset_status.fragment
+dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.shared_context_status.fragment
+dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.sync_status.fragment
diff --git a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml
index 10a591d1688..acb1593cbc3 100644
--- a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml
@@ -77,9 +77,8 @@ llvmpipe-traces:
     PIGLIT_REPLAY_DEVICE_NAME: "gl-vmware-llvmpipe"
     PIGLIT_RESULTS: "llvmpipe-replay"
 
-llvmpipe-gles2:
+.llvmpipe-deqp-test:
   variables:
-    DEQP_VER: gles2
     GALLIVM_PERF: "nopt,no_filter_hacks"
     # Don't use threads inside llvmpipe, we've already got all cores
     # busy at the deqp-runner level.
@@ -90,3 +89,17 @@ llvmpipe-gles2:
     - .test-gl
     - .deqp-test
     - .llvmpipe-test
+
+llvmpipe-gles2:
+  variables:
+    DEQP_VER: gles2
+  extends:
+    - .llvmpipe-deqp-test
+
+llvmpipe-egl:
+  variables:
+    DEQP_VER: egl
+  extends:
+    - .llvmpipe-deqp-test
+  script:
+    - xvfb-run --server-args='-noreset' ./install/deqp-runner.sh