diff --git a/ci/base-tests.sh b/ci/base-tests.sh
index 4b304f6f2a6..69cd5abd925 100755
--- a/ci/base-tests.sh
+++ b/ci/base-tests.sh
@@ -7,7 +7,7 @@ mkdir -p ~/rust/cargo/bin
 cp target/debug/cargo-clippy ~/rust/cargo/bin/cargo-clippy
 cp target/debug/clippy-driver ~/rust/cargo/bin/clippy-driver
 rm ~/.cargo/bin/cargo-clippy
-PATH=$PATH:~/rust/cargo/bin cargo clippy --all -- -D clippy
+PATH=$PATH:~/rust/cargo/bin cargo clippy --all-targets --all-features -- --cap-lints warn -D clippy
 cd clippy_workspace_tests && PATH=$PATH:~/rust/cargo/bin cargo clippy -- -D clippy && cd ..
 cd clippy_workspace_tests/src && PATH=$PATH:~/rust/cargo/bin cargo clippy -- -D clippy && cd ../..
 cd clippy_workspace_tests/subcrate && PATH=$PATH:~/rust/cargo/bin cargo clippy -- -D clippy && cd ../..
diff --git a/ci/integration-tests.sh b/ci/integration-tests.sh
index a989b261ac7..67ace0b5c88 100755
--- a/ci/integration-tests.sh
+++ b/ci/integration-tests.sh
@@ -8,9 +8,9 @@ git clone --depth=1 https://github.com/${INTEGRATION}.git checkout
 cd checkout
 
 function check() {
-  RUST_BACKTRACE=full cargo clippy --all &> clippy_output
+  RUST_BACKTRACE=full cargo clippy --all-targets --all-features -- --cap-lints warn &> clippy_output
   cat clippy_output
-  ! cat clippy_output | grep -q "internal compiler error"
+  ! cat clippy_output | grep -q "internal compiler error\|query stack during panic"
   if [[ $? != 0 ]]; then
     return 1
   fi