diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5059316e8c7..47f732271be 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,12 +36,12 @@ include:
   - local: 'src/gallium/drivers/iris/ci/gitlab-ci.yml'
   - local: 'src/gallium/drivers/lima/ci/gitlab-ci.yml'
   - local: 'src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml'
-  - local: 'src/gallium/drivers/panfrost/ci/gitlab-ci.yml'
   - local: 'src/gallium/drivers/radeonsi/ci/gitlab-ci.yml'
   - local: 'src/gallium/drivers/softpipe/ci/gitlab-ci.yml'
   - local: 'src/gallium/drivers/virgl/ci/gitlab-ci.yml'
   - local: 'src/gallium/drivers/zink/ci/gitlab-ci.yml'
   - local: 'src/gallium/frontends/lavapipe/ci/gitlab-ci.yml'
+  - local: 'src/panfrost/ci/gitlab-ci.yml'
 
 stages:
   - sanity
diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml
index 373772fffb7..8291437ecc2 100644
--- a/.gitlab-ci/test-source-dep.yml
+++ b/.gitlab-ci/test-source-dep.yml
@@ -239,6 +239,7 @@
       - src/gallium/winsys/panfrost/**/*
       when: on_success
     - changes: &panfrost_common_file_list
+      - src/panfrost/ci/*
       - src/panfrost/include/*
       - src/panfrost/lib/*
       - src/panfrost/shared/*
diff --git a/src/gallium/drivers/panfrost/ci/deqp-panfrost-g52-fails.txt b/src/panfrost/ci/deqp-panfrost-g52-fails.txt
similarity index 100%
rename from src/gallium/drivers/panfrost/ci/deqp-panfrost-g52-fails.txt
rename to src/panfrost/ci/deqp-panfrost-g52-fails.txt
diff --git a/src/gallium/drivers/panfrost/ci/deqp-panfrost-g52-flakes.txt b/src/panfrost/ci/deqp-panfrost-g52-flakes.txt
similarity index 100%
rename from src/gallium/drivers/panfrost/ci/deqp-panfrost-g52-flakes.txt
rename to src/panfrost/ci/deqp-panfrost-g52-flakes.txt
diff --git a/src/gallium/drivers/panfrost/ci/deqp-panfrost-g52-skips.txt b/src/panfrost/ci/deqp-panfrost-g52-skips.txt
similarity index 100%
rename from src/gallium/drivers/panfrost/ci/deqp-panfrost-g52-skips.txt
rename to src/panfrost/ci/deqp-panfrost-g52-skips.txt
diff --git a/src/gallium/drivers/panfrost/ci/deqp-panfrost-g52.toml b/src/panfrost/ci/deqp-panfrost-g52.toml
similarity index 100%
rename from src/gallium/drivers/panfrost/ci/deqp-panfrost-g52.toml
rename to src/panfrost/ci/deqp-panfrost-g52.toml
diff --git a/src/gallium/drivers/panfrost/ci/deqp-panfrost-g72-fails.txt b/src/panfrost/ci/deqp-panfrost-g72-fails.txt
similarity index 100%
rename from src/gallium/drivers/panfrost/ci/deqp-panfrost-g72-fails.txt
rename to src/panfrost/ci/deqp-panfrost-g72-fails.txt
diff --git a/src/gallium/drivers/panfrost/ci/deqp-panfrost-g72-flakes.txt b/src/panfrost/ci/deqp-panfrost-g72-flakes.txt
similarity index 100%
rename from src/gallium/drivers/panfrost/ci/deqp-panfrost-g72-flakes.txt
rename to src/panfrost/ci/deqp-panfrost-g72-flakes.txt
diff --git a/src/gallium/drivers/panfrost/ci/deqp-panfrost-g72.toml b/src/panfrost/ci/deqp-panfrost-g72.toml
similarity index 100%
rename from src/gallium/drivers/panfrost/ci/deqp-panfrost-g72.toml
rename to src/panfrost/ci/deqp-panfrost-g72.toml
diff --git a/src/gallium/drivers/panfrost/ci/deqp-panfrost-t720-fails.txt b/src/panfrost/ci/deqp-panfrost-t720-fails.txt
similarity index 100%
rename from src/gallium/drivers/panfrost/ci/deqp-panfrost-t720-fails.txt
rename to src/panfrost/ci/deqp-panfrost-t720-fails.txt
diff --git a/src/gallium/drivers/panfrost/ci/deqp-panfrost-t720-flakes.txt b/src/panfrost/ci/deqp-panfrost-t720-flakes.txt
similarity index 100%
rename from src/gallium/drivers/panfrost/ci/deqp-panfrost-t720-flakes.txt
rename to src/panfrost/ci/deqp-panfrost-t720-flakes.txt
diff --git a/src/gallium/drivers/panfrost/ci/deqp-panfrost-t720-skips.txt b/src/panfrost/ci/deqp-panfrost-t720-skips.txt
similarity index 100%
rename from src/gallium/drivers/panfrost/ci/deqp-panfrost-t720-skips.txt
rename to src/panfrost/ci/deqp-panfrost-t720-skips.txt
diff --git a/src/gallium/drivers/panfrost/ci/deqp-panfrost-t720.toml b/src/panfrost/ci/deqp-panfrost-t720.toml
similarity index 100%
rename from src/gallium/drivers/panfrost/ci/deqp-panfrost-t720.toml
rename to src/panfrost/ci/deqp-panfrost-t720.toml
diff --git a/src/gallium/drivers/panfrost/ci/deqp-panfrost-t760-fails.txt b/src/panfrost/ci/deqp-panfrost-t760-fails.txt
similarity index 100%
rename from src/gallium/drivers/panfrost/ci/deqp-panfrost-t760-fails.txt
rename to src/panfrost/ci/deqp-panfrost-t760-fails.txt
diff --git a/src/gallium/drivers/panfrost/ci/deqp-panfrost-t760-flakes.txt b/src/panfrost/ci/deqp-panfrost-t760-flakes.txt
similarity index 100%
rename from src/gallium/drivers/panfrost/ci/deqp-panfrost-t760-flakes.txt
rename to src/panfrost/ci/deqp-panfrost-t760-flakes.txt
diff --git a/src/gallium/drivers/panfrost/ci/deqp-panfrost-t760.toml b/src/panfrost/ci/deqp-panfrost-t760.toml
similarity index 100%
rename from src/gallium/drivers/panfrost/ci/deqp-panfrost-t760.toml
rename to src/panfrost/ci/deqp-panfrost-t760.toml
diff --git a/src/gallium/drivers/panfrost/ci/deqp-panfrost-t820-fails.txt b/src/panfrost/ci/deqp-panfrost-t820-fails.txt
similarity index 100%
rename from src/gallium/drivers/panfrost/ci/deqp-panfrost-t820-fails.txt
rename to src/panfrost/ci/deqp-panfrost-t820-fails.txt
diff --git a/src/gallium/drivers/panfrost/ci/deqp-panfrost-t860-fails.txt b/src/panfrost/ci/deqp-panfrost-t860-fails.txt
similarity index 100%
rename from src/gallium/drivers/panfrost/ci/deqp-panfrost-t860-fails.txt
rename to src/panfrost/ci/deqp-panfrost-t860-fails.txt
diff --git a/src/gallium/drivers/panfrost/ci/deqp-panfrost-t860-flakes.txt b/src/panfrost/ci/deqp-panfrost-t860-flakes.txt
similarity index 100%
rename from src/gallium/drivers/panfrost/ci/deqp-panfrost-t860-flakes.txt
rename to src/panfrost/ci/deqp-panfrost-t860-flakes.txt
diff --git a/src/gallium/drivers/panfrost/ci/deqp-panfrost-t860-skips.txt b/src/panfrost/ci/deqp-panfrost-t860-skips.txt
similarity index 100%
rename from src/gallium/drivers/panfrost/ci/deqp-panfrost-t860-skips.txt
rename to src/panfrost/ci/deqp-panfrost-t860-skips.txt
diff --git a/src/gallium/drivers/panfrost/ci/deqp-panfrost-t860.toml b/src/panfrost/ci/deqp-panfrost-t860.toml
similarity index 100%
rename from src/gallium/drivers/panfrost/ci/deqp-panfrost-t860.toml
rename to src/panfrost/ci/deqp-panfrost-t860.toml
diff --git a/src/gallium/drivers/panfrost/ci/gitlab-ci.yml b/src/panfrost/ci/gitlab-ci.yml
similarity index 100%
rename from src/gallium/drivers/panfrost/ci/gitlab-ci.yml
rename to src/panfrost/ci/gitlab-ci.yml
diff --git a/src/gallium/drivers/panfrost/ci/traces-panfrost.yml b/src/panfrost/ci/traces-panfrost.yml
similarity index 100%
rename from src/gallium/drivers/panfrost/ci/traces-panfrost.yml
rename to src/panfrost/ci/traces-panfrost.yml