diff --git a/.github/workflows/build_rpi3.yml b/.github/workflows/build_rpi3.yml
index d6dcfa3f..d974eebf 100644
--- a/.github/workflows/build_rpi3.yml
+++ b/.github/workflows/build_rpi3.yml
@@ -29,7 +29,7 @@ jobs:
         uses: ruby/setup-ruby@v1
       - name: Set up Rust nightly
         run: |
-          cargo install cargo-binutils
+          cargo install cargo-binutils rustfilt
       - name: Set up Ruby
         run: |
           gem install bundler
diff --git a/.github/workflows/build_rpi4.yml b/.github/workflows/build_rpi4.yml
index de47cc83..68de1dc1 100644
--- a/.github/workflows/build_rpi4.yml
+++ b/.github/workflows/build_rpi4.yml
@@ -29,7 +29,7 @@ jobs:
         uses: ruby/setup-ruby@v1
       - name: Set up Rust nightly
         run: |
-          cargo install cargo-binutils
+          cargo install cargo-binutils rustfilt
       - name: Set up Ruby
         run: |
           gem install bundler
diff --git a/.github/workflows/test_integration.yml b/.github/workflows/test_integration.yml
index 8c18c0a0..954d6432 100644
--- a/.github/workflows/test_integration.yml
+++ b/.github/workflows/test_integration.yml
@@ -29,7 +29,7 @@ jobs:
         uses: ruby/setup-ruby@v1
       - name: Set up Rust nightly
         run: |
-          cargo install cargo-binutils
+          cargo install cargo-binutils rustfilt
       - name: Set up Ruby
         run: |
           gem install bundler
diff --git a/.github/workflows/test_unit.yml b/.github/workflows/test_unit.yml
index 624cf16d..c9a88892 100644
--- a/.github/workflows/test_unit.yml
+++ b/.github/workflows/test_unit.yml
@@ -29,7 +29,7 @@ jobs:
         uses: ruby/setup-ruby@v1
       - name: Set up Rust nightly
         run: |
-          cargo install cargo-binutils
+          cargo install cargo-binutils rustfilt
       - name: Set up Ruby
         run: |
           gem install bundler
diff --git a/.github/workflows/test_xtra.yml b/.github/workflows/test_xtra.yml
index 97fa2081..a330ef74 100644
--- a/.github/workflows/test_xtra.yml
+++ b/.github/workflows/test_xtra.yml
@@ -37,4 +37,4 @@ jobs:
           bundle install --retry 3
       - name: Make all
         run: |
-          bundle exec ruby utils/devtool.rb test_xtra
+          bundle exec ruby utils/devtool.rb make_xtra
diff --git a/utils/devtool.rb b/utils/devtool.rb
index 7c02e9ba..00417125 100755
--- a/utils/devtool.rb
+++ b/utils/devtool.rb
@@ -343,4 +343,5 @@ else
     puts
     puts 'Commands:'
     commands.each { |m| puts "  #{m}" }
+    exit(1)
 end