diff --git a/.gitlab-ci/bare-metal/arm64_a630_egl.sh b/.gitlab-ci/bare-metal/arm64_a630_egl.sh
deleted file mode 100755
index abb42100081..00000000000
--- a/.gitlab-ci/bare-metal/arm64_a630_egl.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-# This test script groups together a bunch of fast dEQP variant runs
-# to amortize the cost of rebooting the board.
-
-set -ex
-
-EXIT=0
-
-# Run reset tests without parallelism:
-if ! env \
-  DEQP_RESULTS_DIR=results/reset \
-  FDO_CI_CONCURRENT=1 \
-  DEQP_CASELIST_FILTER='.*reset.*' \
-  /install/deqp-runner.sh; then
-    EXIT=1
-fi
-
-# Then run everything else with parallelism:
-if ! env \
-  DEQP_RESULTS_DIR=results/nonrobustness \
-  DEQP_CASELIST_INV_FILTER='.*reset.*' \
-  /install/deqp-runner.sh; then
-    EXIT=1
-fi
-
diff --git a/src/freedreno/ci/deqp-freedreno-a630-egl.toml b/src/freedreno/ci/deqp-freedreno-a630-egl.toml
new file mode 100644
index 00000000000..88972aea524
--- /dev/null
+++ b/src/freedreno/ci/deqp-freedreno-a630-egl.toml
@@ -0,0 +1,10 @@
+# x11
+[[deqp]]
+deqp = "/deqp/modules/egl/deqp-egl"
+caselists = ["/deqp/mustpass/egl-master.txt"]
+skips = ["install/freedreno-a630-premerge-skips.txt"]
+deqp_args = [
+    "--deqp-surface-width=256", "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+]
diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml
index a5a7d19bada..1342d53e189 100644
--- a/src/freedreno/ci/gitlab-ci.yml
+++ b/src/freedreno/ci/gitlab-ci.yml
@@ -196,8 +196,7 @@ a630_gl:
   variables:
     DEQP_SUITE: freedreno-a630
 
-# Robustness tests may be disruptive to other tests, so we run EGL's robustness
-# tests separately.
+# Run dEQP EGL window system tests separately with the window systems available.
 a630_egl:
   extends:
     - .baremetal-deqp-test
@@ -205,7 +204,7 @@ a630_egl:
   variables:
     DEQP_VER: egl
     HWCI_START_XORG: 1
-    HWCI_TEST_SCRIPT: "/install/bare-metal/arm64_a630_egl.sh"
+    DEQP_SUITE: freedreno-a630-egl
 
 a630_gles_asan:
   extends: