diff --git a/src/freedreno/ci/deqp-freedreno-a630-piglit.toml b/src/freedreno/ci/deqp-freedreno-a630-piglit.toml
new file mode 100644
index 00000000000..3a11d098626
--- /dev/null
+++ b/src/freedreno/ci/deqp-freedreno-a630-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 82624762f21..5f8cce3f644 100644
--- a/src/freedreno/ci/gitlab-ci.yml
+++ b/src/freedreno/ci/gitlab-ci.yml
@@ -306,13 +306,13 @@ a630_vk_asan:
 
 a630_piglit:
   extends:
-    - .piglit-test
+    - .baremetal-deqp-test
     - .a630-test
     # Note that piglit has GL+VK integration testing.
     - .freedreno-turnip-rules
   variables:
     HWCI_START_XORG: 1
-    PIGLIT_PROFILES: gpu
+    DEQP_SUITE: freedreno-a630-piglit
 
 a630-traces:
   extends: