diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml
index d06df5c1683..bf50f3088ec 100644
--- a/.gitlab-ci/test-source-dep.yml
+++ b/.gitlab-ci/test-source-dep.yml
@@ -994,6 +994,9 @@
    rules:
     - !reference [.core-rules, rules]
     - changes:
+      - .clang-format
+      - .clang-format-include
+      - .clang-format-ignore
       - src/**/asahi/**/*
       - src/**/panfrost/**/*
       when: on_success
diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml
index ed28835dc32..200052b206f 100644
--- a/.gitlab-ci/test/gitlab-ci.yml
+++ b/.gitlab-ci/test/gitlab-ci.yml
@@ -42,9 +42,10 @@ clang-format:
     LLVM_VERSION: 15
   script:
     - shopt -s globstar
-    - clang-format-${LLVM_VERSION:?} --Werror -i
-      src/**/asahi/**/*.{h,c,cpp}
-      src/**/panfrost/**/*.{h,c,cpp}
+    # We need a meson build dir, but its config doesn't actually matter, so
+    # let's just use the default.
+    - meson setup build
+    - ninja -C build clang-format
     - git diff --color=always --exit-code  # Fails if there are diffs
 
 .test-gl: