diff --git a/.circleci/config.yml b/.circleci/config.yml
index 42c643c47..52d22736c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -18,8 +18,9 @@ jobs:
       - run:
           name: Install lint deps
           command: |
+            rustup toolchain install nightly
             rustup component add rustfmt
-            rustup component add clippy
+            rustup component add clippy --toolchain=nightly || cargo +nightly install --git https://github.com/rust-lang/rust-clippy/ --force clippy
       - run:
           name: Execute lints
           command: |
diff --git a/Makefile b/Makefile
index dbc23c772..871245de2 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ integration-tests: release
 
 lint:
 	cargo fmt --all -- --check
-	# cargo clippy --all
+	cargo +nightly clippy --all
 
 precommit: lint test