diff --git a/src/freedreno/ci/deqp-freedreno-a306-piglit-quick-gl.toml b/src/freedreno/ci/deqp-freedreno-a306-piglit-quick-gl.toml
new file mode 100644
index 00000000000..335f2ffb148
--- /dev/null
+++ b/src/freedreno/ci/deqp-freedreno-a306-piglit-quick-gl.toml
@@ -0,0 +1,8 @@
+[[piglit]]
+piglit_folder = "/piglit"
+profile = "quick_gl"
+process_isolation = true
+  [piglit.env]
+  PIGLIT_PLATFORM = "mixed_glx_egl"
+
+
diff --git a/src/freedreno/ci/deqp-freedreno-a306-piglit-quick-shader.toml b/src/freedreno/ci/deqp-freedreno-a306-piglit-quick-shader.toml
new file mode 100644
index 00000000000..c0ada582a1f
--- /dev/null
+++ b/src/freedreno/ci/deqp-freedreno-a306-piglit-quick-shader.toml
@@ -0,0 +1,8 @@
+[[piglit]]
+piglit_folder = "/piglit"
+profile = "quick_shader"
+process_isolation = true
+  [piglit.env]
+  PIGLIT_PLATFORM = "mixed_glx_egl"
+
+
diff --git a/src/freedreno/ci/deqp-freedreno-a306-piglit.toml b/src/freedreno/ci/deqp-freedreno-a306-piglit.toml
new file mode 100644
index 00000000000..3a11d098626
--- /dev/null
+++ b/src/freedreno/ci/deqp-freedreno-a306-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 239f0e68a95..2f4238e5efe 100644
--- a/src/freedreno/ci/gitlab-ci.yml
+++ b/src/freedreno/ci/gitlab-ci.yml
@@ -13,10 +13,11 @@ a306_gl:
 # New jobs. Leave it as manual for now.
 .a306_piglit:
   extends:
-    - .piglit-test
+    - .baremetal-deqp-test
     - .a306-test
     - .google-freedreno-manual-rules
   variables:
+    DEQP_SUITE: freedreno-a306-piglit
     HWCI_START_XORG: 1
 
 # Something happened and now this hangchecks and doesn't recover.  Unkown when
@@ -25,15 +26,15 @@ a306_gl:
   extends:
     - .a306_piglit
   variables:
-    PIGLIT_PROFILES: quick_gl
     BM_KERNEL_EXTRA_ARGS: "msm.num_hw_submissions=1"
+    DEQP_SUITE: freedreno-a306-piglit-quick-gl
     FDO_CI_CONCURRENT: 3
 
 a306_piglit_shader:
   extends:
     - .a306_piglit
   variables:
-    PIGLIT_PROFILES: quick_shader
+    DEQP_SUITE: freedreno-a306-piglit-quick-shader
     FDO_CI_CONCURRENT: 6
 
 a306-traces: