diff --git a/Makefile b/Makefile
index 8b85da7d6..1ff408ea8 100644
--- a/Makefile
+++ b/Makefile
@@ -310,7 +310,7 @@ check-includes:
 	@git ls-files -- "*.c" "*.h" | grep -vE '^ccan/' | xargs grep -n 'list_for_each' | sed 's/\([^:]*:.*\):.*/uninitvar:\1/' > $@
 
 check-cppcheck: .cppcheck-suppress
-	@trap 'rm -f .cppcheck-suppress' 0; git ls-files -- "*.c" "*.h" | grep -vE '^ccan/' | xargs cppcheck -q --language=c --std=c11 --error-exitcode=1 --suppressions-list=.cppcheck-suppress
+	@trap 'rm -f .cppcheck-suppress' 0; git ls-files -- "*.c" "*.h" | grep -vE '^ccan/' | xargs cppcheck -q --language=c --std=c11 --error-exitcode=1 --suppressions-list=.cppcheck-suppress --inline-suppr
 
 check-shellcheck:
 	@git ls-files -- "*.sh" | xargs shellcheck
diff --git a/gossipd/routing.c b/gossipd/routing.c
index e77c2e606..1ec935a99 100644
--- a/gossipd/routing.c
+++ b/gossipd/routing.c
@@ -900,6 +900,8 @@ u8 *handle_channel_announcement(struct routing_state *rstate,
 	tal_add_destructor2(pending, destroy_pending_cannouncement, rstate);
 
 	/* Success */
+	// MSC: Cppcheck 1.86 gets this false positive
+	// cppcheck-suppress autoVariables
 	*scid = &pending->short_channel_id;
 	return NULL;