diff --git a/.pick_status.json b/.pick_status.json
index f7406312f86..ff029ccbf81 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -31,7 +31,7 @@
         "description": "ci/freedreno: fix the a530_piglit job and switch to Weston",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "83c2b26acf1e6c5434d2183294103c959c7ab268"
     },
diff --git a/src/freedreno/ci/deqp-freedreno-a530-piglit.toml b/src/freedreno/ci/deqp-freedreno-a530-piglit.toml
new file mode 100644
index 00000000000..3a11d098626
--- /dev/null
+++ b/src/freedreno/ci/deqp-freedreno-a530-piglit.toml
@@ -0,0 +1,6 @@
+[[piglit]]
+piglit_folder = "/piglit"
+profile = "gpu"
+process_isolation = true
+  [piglit.env]
+  PIGLIT_NO_WINDOW = "1"
diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml
index 4191ef5bdf6..956f424c1b0 100644
--- a/src/freedreno/ci/gitlab-ci.yml
+++ b/src/freedreno/ci/gitlab-ci.yml
@@ -104,22 +104,25 @@ a530_gl:
     PIGLIT_PLATFORM: gbm
   parallel: 6
 
-.a530_piglit:
-  extends:
-    - .piglit-test
-    - .a530-test
-  variables:
-    HWCI_START_XORG: 1
-
-# piglit_gl since it takes a bit under 20 minutes and has a lot of flakes, so
+# piglit and piglit_gl since it takes a bit under 20 minutes and has a lot of flakes, so
 # leave it as manual.  The shader_tests are in the main a530_gl suite.
 #
 # Disabled for now because something reliably takes out the board 19-20 minutes in,
 # and then it reboots and tries again until the job timeout.
+.a530_piglit:
+  extends:
+    - .baremetal-deqp-test
+    - .a530-test
+  parallel: 2
+  variables:
+    DEQP_SUITE: freedreno-a530-piglit
+    HWCI_START_WESTON: 1
+
 .a530_piglit_gl:
   extends:
     - .a530_piglit
     - .freedreno-manual-rules
+  parallel: null
   variables:
     PIGLIT_PROFILES: quick_gl