diff --git a/.cargo/config.toml b/.cargo/config.toml
new file mode 100644
index 00000000000..2aef593a0c4
--- /dev/null
+++ b/.cargo/config.toml
@@ -0,0 +1,23 @@
+[target.'cfg(any(test, not(test)))']
+rustflags = [
+    # Rustc lints
+    # "-W", "warning_name"
+    # "-A", "warning_name"
+
+    # Clippy lints
+    "-W", "clippy::cloned_instead_of_copied",
+    "-W", "clippy::explicit_iter_loop",
+    "-W", "clippy::map_unwrap_or",
+    "-W", "clippy::redundant_closure_for_method_calls",
+    "-W", "clippy::unnested_or_patterns",
+    "-W", "clippy::uninlined_format_args",
+
+    # Rejected for now, and why
+    # "-W" "clippy::default_trait_access" - sometimes makes imports necessary, just for a default value. It's good for more explicit typing though.
+    # "-W" "clippy::range_plus_one" - useful, but caused too many false positives as we use range types directly quite a lot
+
+
+    # Rustdoc lints
+    # "-W", "rustdoc::warning_name"
+    # "-A", "rustdoc::warning_name"
+]
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 42799ff7c15..fea38c9ed3a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -144,7 +144,7 @@ jobs:
           components: clippy,rustfmt
       - uses: extractions/setup-just@v1
       - name: Run cargo clippy
-        run: just clippy
+        run: just clippy -D warnings
       - name: Run cargo doc
         run: just doc
       - name: Run cargo fmt
diff --git a/justfile b/justfile
index a2184e5700e..5c96320f2e7 100755
--- a/justfile
+++ b/justfile
@@ -14,32 +14,19 @@ test: clippy check doc unit-tests journey-tests-pure journey-tests-small journey
 # run all tests, without clippy, including journey tests, try building docs
 ci-test: check doc unit-tests journey-tests-pure journey-tests-small journey-tests-async journey-tests journey-tests-smart-release
 
-# Rejected for now, and why
-#	-D clippy::default-trait-access - sometimes makes imports necessary, just for a default value. It's good for more explicit typing though.
-#   -D clippy::range-plus-one - useful, but caused too many false positives as we use range types directly quite a lot
-
-clippy-flags := """
-  -D clippy::cloned-instead-of-copied \
-  -D clippy::explicit-iter-loop \
-  -D clippy::map-unwrap-or \
-  -D clippy::redundant-closure-for-method-calls \
-  -D clippy::uninlined_format_args \
-  -D clippy::unnested-or-patterns \
-"""
-
 # Run cargo clippy on all crates
-clippy:
-    cargo clippy --all --tests --examples -- {{ clippy-flags }}
-    cargo clippy --all --no-default-features --features small -- {{ clippy-flags }}
-    cargo clippy --all --no-default-features --features max-pure -- {{ clippy-flags }}
-    cargo clippy --all --no-default-features --features lean-async --tests -- {{ clippy-flags }}
+clippy *clippy-args:
+    cargo clippy --all --tests --examples -- {{ clippy-args }}
+    cargo clippy --all --no-default-features --features small -- {{ clippy-args }}
+    cargo clippy --all --no-default-features --features max-pure -- {{ clippy-args }}
+    cargo clippy --all --no-default-features --features lean-async --tests -- {{ clippy-args }}
 
 # Run cargo clippy on all crates, fixing what can be fixed, and format all code
 clippy-fix:
-    cargo clippy --fix --all --tests --examples -- {{ clippy-flags }}
-    cargo clippy --fix --allow-dirty --all --no-default-features --features small -- {{ clippy-flags }}
-    cargo clippy --fix --allow-dirty --all --no-default-features --features max-pure -- {{ clippy-flags }}
-    cargo clippy --fix --allow-dirty --all --no-default-features --features lean-async --tests -- {{ clippy-flags }}
+    cargo clippy --fix --all --tests --examples
+    cargo clippy --fix --allow-dirty --all --no-default-features --features small
+    cargo clippy --fix --allow-dirty --all --no-default-features --features max-pure
+    cargo clippy --fix --allow-dirty --all --no-default-features --features lean-async --tests
     cargo fmt --all
 
 # Build all code in suitable configurations