diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 44730bab4ed..75694ebd9ce 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -96,7 +96,10 @@ jobs:
         ./y.sh test --release --clean --build-sysroot ${{ matrix.commands }}
 
     - name: Check formatting
-      run: cargo fmt -- --check
+      run: |
+        cargo fmt -- --check
+        cd build_system
+        cargo fmt -- --check
 
     - name: clippy
       run: |
diff --git a/build_system/src/test.rs b/build_system/src/test.rs
index 86e6f1a95e9..8ce615ff17a 100644
--- a/build_system/src/test.rs
+++ b/build_system/src/test.rs
@@ -127,7 +127,9 @@ fn new() -> Result<Option<Self>, String> {
                     show_usage();
                     return Ok(None);
                 }
-                x if runners.contains_key(x) && !test_arg.runners.iter().any(|runner| runner == x) => {
+                x if runners.contains_key(x)
+                    && !test_arg.runners.iter().any(|runner| runner == x) =>
+                {
                     test_arg.runners.push(x.into());
                 }
                 arg => {