diff --git a/ci/test-checks.sh b/ci/test-checks.sh
index 908a18a3ec8eee..3d6b2c6cf2eb74 100755
--- a/ci/test-checks.sh
+++ b/ci/test-checks.sh
@@ -18,14 +18,15 @@ if _ scripts/cargo-for-all-lock-files.sh +"$rust_nightly" check --locked --all-t
 else
   check_status=$?
   echo "Some Cargo.lock is outdated; please update them as well"
-  echo "protip: you can use ./scripts/cargo-for-all-lock-files.sh update ..."
+  echo "protip: you can use ./scripts/cargo-for-all-lock-files.sh [check|update] ..."
   exit "$check_status"
 fi
 
 _ cargo +"$rust_stable" fmt --all -- --check
 
-_ cargo +"$rust_nightly" clippy --version
-_ cargo +"$rust_nightly" clippy --workspace --all-targets -- --deny=warnings
+# -Z... is needed because of clippy bug: https://github.com/rust-lang/rust-clippy/issues/4612
+_ cargo +"$rust_nightly" clippy -Zunstable-options --version
+_ cargo +"$rust_nightly" clippy -Zunstable-options --workspace --all-targets -- --deny=warnings
 
 _ cargo +"$rust_stable" audit --version
 _ scripts/cargo-for-all-lock-files.sh +"$rust_stable" audit --ignore RUSTSEC-2020-0002 --ignore RUSTSEC-2020-0008
diff --git a/scripts/cargo-for-all-lock-files.sh b/scripts/cargo-for-all-lock-files.sh
index 9a635853aa3b9f..8de7bccb867330 100755
--- a/scripts/cargo-for-all-lock-files.sh
+++ b/scripts/cargo-for-all-lock-files.sh
@@ -30,6 +30,9 @@ else
 fi
 
 for lock_file in $files; do
+  if [[ -n $CI ]]; then
+    echo "--- [$lock_file]: cargo " "${shifted_args[@]}" "$@"
+  fi
   (
     set -x
     cd "$(dirname "$lock_file")"