diff --git a/.gitlab-ci/prepare-artifacts.sh b/.gitlab-ci/prepare-artifacts.sh
index 6ebf31ab8c9..125b39e2b82 100755
--- a/.gitlab-ci/prepare-artifacts.sh
+++ b/.gitlab-ci/prepare-artifacts.sh
@@ -32,6 +32,9 @@ cp -Rp .gitlab-ci/fossils install/
 cp -Rp .gitlab-ci/fossilize-runner.sh install/
 cp -Rp .gitlab-ci/deqp-runner.sh install/
 cp -Rp ci-expects/*/* install/
+find . -path \*/ci/\*.txt \
+    -o -path \*/ci/\*traces\*.yml \
+    | xargs -I '{}' cp -p '{}' install/
 
 # Tar up the install dir so that symlinks and hardlinks aren't each
 # packed separately in the zip file.
diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml
index 7c69bd4bf11..1cad7e3fe0b 100644
--- a/.gitlab-ci/test-source-dep.yml
+++ b/.gitlab-ci/test-source-dep.yml
@@ -93,7 +93,6 @@
       - src/gallium/drivers/llvmpipe/**/*
       - src/gallium/frontends/lavapipe/**/*
       - src/gallium/winsys/sw/**/*
-      - ci-expects/llvmpipe/*
       when: on_success
     - when: never
 
@@ -146,7 +145,6 @@
       - src/freedreno/vulkan/**/*
       - src/gallium/drivers/freedreno/**/*
       - src/gallium/winsys/freedreno/**/*
-      - ci-expects/freedreno/*
       when: on_success
     - when: never
 
@@ -183,7 +181,6 @@
       - src/gallium/drivers/vc4/**/*
       - src/gallium/winsys/kmsro/**/*
       - src/gallium/winsys/vc4/**/*
-      - ci-expects/vc4/*
       when: on_success
     - when: never
 
@@ -202,7 +199,6 @@
       - src/gallium/drivers/v3d/**/*
       - src/gallium/winsys/kmsro/**/*
       - src/gallium/winsys/v3d/**/*
-      - ci-expects/v3d/*
       when: on_success
     - when: never
 
@@ -215,7 +211,6 @@
       when: on_success
     - changes:
       - src/broadcom/**/*
-      - ci-expects/v3dv/*
       when: on_success
     - when: never
 
@@ -246,7 +241,6 @@
     - changes:
       - src/amd/**/*
       - src/vulkan/**/*
-      - ci-expects/radv/*
       when: on_success
     - when: never
 
@@ -266,7 +260,6 @@
     - changes:
       - src/gallium/drivers/virgl/**/*
       - src/gallium/winsys/virgl/**/*
-      - ci-expects/virgl/*
       when: on_success
     - when: never
 
diff --git a/ci-expects/radv/deqp-radv-default-skips.txt b/src/amd/ci/deqp-radv-default-skips.txt
similarity index 100%
rename from ci-expects/radv/deqp-radv-default-skips.txt
rename to src/amd/ci/deqp-radv-default-skips.txt
diff --git a/ci-expects/radv/deqp-radv-fiji-aco-fails.txt b/src/amd/ci/deqp-radv-fiji-aco-fails.txt
similarity index 100%
rename from ci-expects/radv/deqp-radv-fiji-aco-fails.txt
rename to src/amd/ci/deqp-radv-fiji-aco-fails.txt
diff --git a/ci-expects/radv/deqp-radv-navi10-aco-fails.txt b/src/amd/ci/deqp-radv-navi10-aco-fails.txt
similarity index 100%
rename from ci-expects/radv/deqp-radv-navi10-aco-fails.txt
rename to src/amd/ci/deqp-radv-navi10-aco-fails.txt
diff --git a/ci-expects/radv/deqp-radv-navi14-aco-fails.txt b/src/amd/ci/deqp-radv-navi14-aco-fails.txt
similarity index 100%
rename from ci-expects/radv/deqp-radv-navi14-aco-fails.txt
rename to src/amd/ci/deqp-radv-navi14-aco-fails.txt
diff --git a/ci-expects/radv/deqp-radv-oland-aco-fails.txt b/src/amd/ci/deqp-radv-oland-aco-fails.txt
similarity index 100%
rename from ci-expects/radv/deqp-radv-oland-aco-fails.txt
rename to src/amd/ci/deqp-radv-oland-aco-fails.txt
diff --git a/ci-expects/radv/deqp-radv-pitcairn-aco-fails.txt b/src/amd/ci/deqp-radv-pitcairn-aco-fails.txt
similarity index 100%
rename from ci-expects/radv/deqp-radv-pitcairn-aco-fails.txt
rename to src/amd/ci/deqp-radv-pitcairn-aco-fails.txt
diff --git a/ci-expects/radv/deqp-radv-polaris10-aco-fails.txt b/src/amd/ci/deqp-radv-polaris10-aco-fails.txt
similarity index 100%
rename from ci-expects/radv/deqp-radv-polaris10-aco-fails.txt
rename to src/amd/ci/deqp-radv-polaris10-aco-fails.txt
diff --git a/ci-expects/radv/deqp-radv-polaris10-skips.txt b/src/amd/ci/deqp-radv-polaris10-skips.txt
similarity index 100%
rename from ci-expects/radv/deqp-radv-polaris10-skips.txt
rename to src/amd/ci/deqp-radv-polaris10-skips.txt
diff --git a/ci-expects/radv/deqp-radv-raven-aco-fails.txt b/src/amd/ci/deqp-radv-raven-aco-fails.txt
similarity index 100%
rename from ci-expects/radv/deqp-radv-raven-aco-fails.txt
rename to src/amd/ci/deqp-radv-raven-aco-fails.txt
diff --git a/ci-expects/radv/deqp-radv-raven-aco-skips.txt b/src/amd/ci/deqp-radv-raven-aco-skips.txt
similarity index 100%
rename from ci-expects/radv/deqp-radv-raven-aco-skips.txt
rename to src/amd/ci/deqp-radv-raven-aco-skips.txt
diff --git a/ci-expects/radv/deqp-radv-sienna_cichlid-aco-fails.txt b/src/amd/ci/deqp-radv-sienna_cichlid-aco-fails.txt
similarity index 100%
rename from ci-expects/radv/deqp-radv-sienna_cichlid-aco-fails.txt
rename to src/amd/ci/deqp-radv-sienna_cichlid-aco-fails.txt
diff --git a/ci-expects/radv/deqp-radv-vega10-aco-fails.txt b/src/amd/ci/deqp-radv-vega10-aco-fails.txt
similarity index 100%
rename from ci-expects/radv/deqp-radv-vega10-aco-fails.txt
rename to src/amd/ci/deqp-radv-vega10-aco-fails.txt
diff --git a/ci-expects/radv/traces-radv.yml b/src/amd/ci/traces-radv.yml
similarity index 100%
rename from ci-expects/radv/traces-radv.yml
rename to src/amd/ci/traces-radv.yml
diff --git a/ci-expects/v3d/deqp-v3d-rpi4-fails.txt b/src/broadcom/ci/deqp-v3d-rpi4-fails.txt
similarity index 100%
rename from ci-expects/v3d/deqp-v3d-rpi4-fails.txt
rename to src/broadcom/ci/deqp-v3d-rpi4-fails.txt
diff --git a/ci-expects/v3d/deqp-v3d-rpi4-flakes.txt b/src/broadcom/ci/deqp-v3d-rpi4-flakes.txt
similarity index 100%
rename from ci-expects/v3d/deqp-v3d-rpi4-flakes.txt
rename to src/broadcom/ci/deqp-v3d-rpi4-flakes.txt
diff --git a/ci-expects/v3dv/deqp-v3dv-rpi4-fails.txt b/src/broadcom/ci/deqp-v3dv-rpi4-fails.txt
similarity index 100%
rename from ci-expects/v3dv/deqp-v3dv-rpi4-fails.txt
rename to src/broadcom/ci/deqp-v3dv-rpi4-fails.txt
diff --git a/ci-expects/v3dv/deqp-v3dv-rpi4-skips.txt b/src/broadcom/ci/deqp-v3dv-rpi4-skips.txt
similarity index 100%
rename from ci-expects/v3dv/deqp-v3dv-rpi4-skips.txt
rename to src/broadcom/ci/deqp-v3dv-rpi4-skips.txt
diff --git a/ci-expects/vc4/deqp-vc4-rpi3-fails.txt b/src/broadcom/ci/deqp-vc4-rpi3-fails.txt
similarity index 100%
rename from ci-expects/vc4/deqp-vc4-rpi3-fails.txt
rename to src/broadcom/ci/deqp-vc4-rpi3-fails.txt
diff --git a/ci-expects/vc4/deqp-vc4-rpi3-flakes.txt b/src/broadcom/ci/deqp-vc4-rpi3-flakes.txt
similarity index 100%
rename from ci-expects/vc4/deqp-vc4-rpi3-flakes.txt
rename to src/broadcom/ci/deqp-vc4-rpi3-flakes.txt
diff --git a/ci-expects/vc4/deqp-vc4-rpi3-skips.txt b/src/broadcom/ci/deqp-vc4-rpi3-skips.txt
similarity index 100%
rename from ci-expects/vc4/deqp-vc4-rpi3-skips.txt
rename to src/broadcom/ci/deqp-vc4-rpi3-skips.txt
diff --git a/ci-expects/freedreno/deqp-freedreno-a307-fails.txt b/src/freedreno/ci/deqp-freedreno-a307-fails.txt
similarity index 100%
rename from ci-expects/freedreno/deqp-freedreno-a307-fails.txt
rename to src/freedreno/ci/deqp-freedreno-a307-fails.txt
diff --git a/ci-expects/freedreno/deqp-freedreno-a307-flakes.txt b/src/freedreno/ci/deqp-freedreno-a307-flakes.txt
similarity index 100%
rename from ci-expects/freedreno/deqp-freedreno-a307-flakes.txt
rename to src/freedreno/ci/deqp-freedreno-a307-flakes.txt
diff --git a/ci-expects/freedreno/deqp-freedreno-a530-fails.txt b/src/freedreno/ci/deqp-freedreno-a530-fails.txt
similarity index 100%
rename from ci-expects/freedreno/deqp-freedreno-a530-fails.txt
rename to src/freedreno/ci/deqp-freedreno-a530-fails.txt
diff --git a/ci-expects/freedreno/deqp-freedreno-a530-flakes.txt b/src/freedreno/ci/deqp-freedreno-a530-flakes.txt
similarity index 100%
rename from ci-expects/freedreno/deqp-freedreno-a530-flakes.txt
rename to src/freedreno/ci/deqp-freedreno-a530-flakes.txt
diff --git a/ci-expects/freedreno/deqp-freedreno-a630-asan-fails.txt b/src/freedreno/ci/deqp-freedreno-a630-asan-fails.txt
similarity index 100%
rename from ci-expects/freedreno/deqp-freedreno-a630-asan-fails.txt
rename to src/freedreno/ci/deqp-freedreno-a630-asan-fails.txt
diff --git a/ci-expects/freedreno/deqp-freedreno-a630-bypass-fails.txt b/src/freedreno/ci/deqp-freedreno-a630-bypass-fails.txt
similarity index 100%
rename from ci-expects/freedreno/deqp-freedreno-a630-bypass-fails.txt
rename to src/freedreno/ci/deqp-freedreno-a630-bypass-fails.txt
diff --git a/ci-expects/freedreno/deqp-freedreno-a630-bypass-flakes.txt b/src/freedreno/ci/deqp-freedreno-a630-bypass-flakes.txt
similarity index 100%
rename from ci-expects/freedreno/deqp-freedreno-a630-bypass-flakes.txt
rename to src/freedreno/ci/deqp-freedreno-a630-bypass-flakes.txt
diff --git a/ci-expects/freedreno/deqp-freedreno-a630-fails.txt b/src/freedreno/ci/deqp-freedreno-a630-fails.txt
similarity index 100%
rename from ci-expects/freedreno/deqp-freedreno-a630-fails.txt
rename to src/freedreno/ci/deqp-freedreno-a630-fails.txt
diff --git a/ci-expects/freedreno/deqp-freedreno-a630-flakes.txt b/src/freedreno/ci/deqp-freedreno-a630-flakes.txt
similarity index 100%
rename from ci-expects/freedreno/deqp-freedreno-a630-flakes.txt
rename to src/freedreno/ci/deqp-freedreno-a630-flakes.txt
diff --git a/ci-expects/freedreno/deqp-freedreno-a630-skips.txt b/src/freedreno/ci/deqp-freedreno-a630-skips.txt
similarity index 100%
rename from ci-expects/freedreno/deqp-freedreno-a630-skips.txt
rename to src/freedreno/ci/deqp-freedreno-a630-skips.txt
diff --git a/ci-expects/freedreno/traces-freedreno.yml b/src/freedreno/ci/traces-freedreno.yml
similarity index 100%
rename from ci-expects/freedreno/traces-freedreno.yml
rename to src/freedreno/ci/traces-freedreno.yml
diff --git a/ci-expects/llvmpipe/deqp-llvmpipe-fails.txt b/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-fails.txt
similarity index 100%
rename from ci-expects/llvmpipe/deqp-llvmpipe-fails.txt
rename to src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-fails.txt
diff --git a/ci-expects/lvp/deqp-lvp-fails.txt b/src/gallium/drivers/llvmpipe/ci/deqp-lvp-fails.txt
similarity index 100%
rename from ci-expects/lvp/deqp-lvp-fails.txt
rename to src/gallium/drivers/llvmpipe/ci/deqp-lvp-fails.txt
diff --git a/ci-expects/lvp/deqp-lvp-flakes.txt b/src/gallium/drivers/llvmpipe/ci/deqp-lvp-flakes.txt
similarity index 100%
rename from ci-expects/lvp/deqp-lvp-flakes.txt
rename to src/gallium/drivers/llvmpipe/ci/deqp-lvp-flakes.txt
diff --git a/ci-expects/lvp/deqp-lvp-skips.txt b/src/gallium/drivers/llvmpipe/ci/deqp-lvp-skips.txt
similarity index 100%
rename from ci-expects/lvp/deqp-lvp-skips.txt
rename to src/gallium/drivers/llvmpipe/ci/deqp-lvp-skips.txt
diff --git a/ci-expects/llvmpipe/traces-llvmpipe.yml b/src/gallium/drivers/llvmpipe/ci/traces-llvmpipe.yml
similarity index 100%
rename from ci-expects/llvmpipe/traces-llvmpipe.yml
rename to src/gallium/drivers/llvmpipe/ci/traces-llvmpipe.yml
diff --git a/ci-expects/softpipe/deqp-softpipe-asan-fails.txt b/src/gallium/drivers/softpipe/ci/deqp-softpipe-asan-fails.txt
similarity index 100%
rename from ci-expects/softpipe/deqp-softpipe-asan-fails.txt
rename to src/gallium/drivers/softpipe/ci/deqp-softpipe-asan-fails.txt
diff --git a/ci-expects/softpipe/deqp-softpipe-fails.txt b/src/gallium/drivers/softpipe/ci/deqp-softpipe-fails.txt
similarity index 100%
rename from ci-expects/softpipe/deqp-softpipe-fails.txt
rename to src/gallium/drivers/softpipe/ci/deqp-softpipe-fails.txt
diff --git a/ci-expects/softpipe/deqp-softpipe-flakes.txt b/src/gallium/drivers/softpipe/ci/deqp-softpipe-flakes.txt
similarity index 100%
rename from ci-expects/softpipe/deqp-softpipe-flakes.txt
rename to src/gallium/drivers/softpipe/ci/deqp-softpipe-flakes.txt
diff --git a/ci-expects/softpipe/deqp-softpipe-skips.txt b/src/gallium/drivers/softpipe/ci/deqp-softpipe-skips.txt
similarity index 100%
rename from ci-expects/softpipe/deqp-softpipe-skips.txt
rename to src/gallium/drivers/softpipe/ci/deqp-softpipe-skips.txt
diff --git a/ci-expects/virgl/deqp-virgl-gl-fails.txt b/src/gallium/drivers/virgl/ci/deqp-virgl-gl-fails.txt
similarity index 100%
rename from ci-expects/virgl/deqp-virgl-gl-fails.txt
rename to src/gallium/drivers/virgl/ci/deqp-virgl-gl-fails.txt
diff --git a/ci-expects/virgl/deqp-virgl-gl-skips.txt b/src/gallium/drivers/virgl/ci/deqp-virgl-gl-skips.txt
similarity index 100%
rename from ci-expects/virgl/deqp-virgl-gl-skips.txt
rename to src/gallium/drivers/virgl/ci/deqp-virgl-gl-skips.txt
diff --git a/ci-expects/virgl/deqp-virgl-gles-fails.txt b/src/gallium/drivers/virgl/ci/deqp-virgl-gles-fails.txt
similarity index 100%
rename from ci-expects/virgl/deqp-virgl-gles-fails.txt
rename to src/gallium/drivers/virgl/ci/deqp-virgl-gles-fails.txt
diff --git a/ci-expects/virgl/traces-virgl.yml b/src/gallium/drivers/virgl/ci/traces-virgl.yml
similarity index 100%
rename from ci-expects/virgl/traces-virgl.yml
rename to src/gallium/drivers/virgl/ci/traces-virgl.yml