diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 5ac66ae23..c55922f00 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -24,6 +24,8 @@ jobs:
     timeout-minutes: 30
     env:
       BOLTDIR: bolts
+      VALGRIND: 0
+      PYTEST_OPTS: --timeout=1200
     strategy:
       fail-fast: true
     steps:
diff --git a/Makefile b/Makefile
index 14bd27456..74d0453dd 100644
--- a/Makefile
+++ b/Makefile
@@ -577,8 +577,13 @@ check-amount-access:
 	@! (git grep -nE "(->|\.)(milli)?satoshis" -- "*.c" "*.h" ":(exclude)common/amount.*" ":(exclude)*/test/*" | grep -v '/* Raw:')
 	@! git grep -nE "\\(struct amount_(m)?sat\\)" -- "*.c" "*.h" ":(exclude)common/amount.*" ":(exclude)*/test/*" | grep -vE "sizeof.struct amount_(m)?sat."
 
+check-doc-examples:
+	$(PYTEST) $(PYTEST_OPTS) tests/autogenerate-rpc-examples.py
+	git diff --exit-code HEAD
+
+
 # For those without working cppcheck
-check-source-no-cppcheck: check-makefile check-source-bolt check-whitespace check-spelling check-python check-includes check-shellcheck check-setup_locale check-tmpctx check-discouraged-functions check-amount-access
+check-source-no-cppcheck: check-makefile check-source-bolt check-whitespace check-spelling check-python check-includes check-shellcheck check-setup_locale check-tmpctx check-discouraged-functions check-amount-access check-doc-examples
 
 check-source: check-source-no-cppcheck