diff --git a/src/etnaviv/ci/deqp-etnaviv-gc2000-piglit.toml b/src/etnaviv/ci/deqp-etnaviv-gc2000-piglit.toml
new file mode 100644
index 00000000000..96aad9ba6eb
--- /dev/null
+++ b/src/etnaviv/ci/deqp-etnaviv-gc2000-piglit.toml
@@ -0,0 +1,8 @@
+[[piglit]]
+piglit_folder = "/piglit"
+profile = "gpu"
+process_isolation = true
+  [piglit.env]
+  PIGLIT_NO_WINDOW = "1"
+  PIGLIT_PLATFORM = "gbm"
+  WAFFLE_PLATFORM = "gbm"
diff --git a/src/etnaviv/ci/gitlab-ci.yml b/src/etnaviv/ci/gitlab-ci.yml
index bb33d64b39d..77d6ebebd87 100644
--- a/src/etnaviv/ci/gitlab-ci.yml
+++ b/src/etnaviv/ci/gitlab-ci.yml
@@ -79,14 +79,13 @@ gc2000_gles2_asan:
 
 gc2000_piglit:
   extends:
-    - .piglit-test
+    - .baremetal-deqp-test
     - .baremetal-test-arm32
     - .austriancoder-imx6q-cubox-i:arm32
     - .etnaviv-manual-rules
   variables:
+    DEQP_SUITE: etnaviv-gc2000-piglit
     FLAKES_CHANNEL: "#etnaviv-ci"
-    PIGLIT_PLATFORM: gbm
-    PIGLIT_PROFILES: gpu
     TEST_PHASE_TIMEOUT: 40
   timeout: 40m