diff --git a/src/freedreno/ci/deqp-freedreno-a630-gles-asan.toml b/src/freedreno/ci/deqp-freedreno-a630-gles-asan.toml
new file mode 100644
index 00000000000..7721271f0a1
--- /dev/null
+++ b/src/freedreno/ci/deqp-freedreno-a630-gles-asan.toml
@@ -0,0 +1,14 @@
+[[deqp]]
+deqp = "/deqp/modules/gles31/deqp-gles31"
+caselists = ["/deqp/mustpass/gles31-main.txt"]
+skips = ["/install/freedreno-a6xx-skips.txt"]
+fraction = 100
+renderer_check = "FD630"
+deqp_args = [
+    "--deqp-surface-width=256",
+    "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+    "--deqp-visibility=hidden",
+]
+prefix = "asan-"
diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml
index cb880188143..8bd5cb871a3 100644
--- a/src/freedreno/ci/gitlab-ci.yml
+++ b/src/freedreno/ci/gitlab-ci.yml
@@ -278,11 +278,8 @@ a630-gles-asan:
     - .a630-test
     - .baremetal-arm64-asan-test
   variables:
-    DEQP_VER: gles31
-    DEQP_FRACTION: 100
-    DEQP_EXPECTED_RENDERER: FD630
+    DEQP_SUITE: freedreno-a630-gles-asan
     FDO_CI_CONCURRENT: 2 # We get OOMkills if we go too wide with asan enabled
-    GPU_VERSION: freedreno-a630-asan
 
 a630-vk:
   extends: