diff --git a/cranelift/format-all.sh b/cranelift/format-all.sh
index d9e97f1026..6ccac9c289 100755
--- a/cranelift/format-all.sh
+++ b/cranelift/format-all.sh
@@ -6,12 +6,8 @@
 set -e
 
 cd $(dirname "$0")
-src=$(pwd)
 
 # Make sure we can find rustfmt.
 export PATH="$PATH:$HOME/.cargo/bin"
 
-for crate in $(find "$src" -name Cargo.toml); do
-    cd $(dirname "$crate")
-    cargo fmt -- "$@"
-done
+exec cargo fmt --all -- "$@"
diff --git a/cranelift/test-all.sh b/cranelift/test-all.sh
index 41b2b96f50..a5b2e92066 100755
--- a/cranelift/test-all.sh
+++ b/cranelift/test-all.sh
@@ -40,14 +40,9 @@ if [ -n "$needcheck" ]; then
     touch $tsfile || echo no target directory
 fi
 
-PKGS="cretonne cretonne-reader cretonne-tools cretonne-frontend cretonne-wasm \
-      filecheck "
 cd "$topdir"
-for PKG in $PKGS
-do
-    banner "Rust $PKG unit tests"
-    cargo test -p $PKG
-done
+banner "Rust unit tests"
+cargo test --all
 
 # Build cton-util for parser testing.
 cd "$topdir"