diff --git a/.circleci/config.yml b/.circleci/config.yml
index e4317cd5ec..ad4f6230b1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -17,7 +17,9 @@ jobs:
           key: pip-package-v1-{{ .Branch }}
       - run: pipenv run flake8 wagtail
       - run: pipenv run isort --check-only --diff --recursive wagtail
-      - run: pipenv run jinjalint --parse-only wagtail || true
+      # Filter out known false positives, while preserving normal output and error codes.
+      # See https://github.com/motet-a/jinjalint/issues/18.
+      - run: pipenv run jinjalint --parse-only wagtail | grep -v 'welcome_page.html:6:70' | tee /dev/tty | wc -l | grep -q '0'
       - run: DATABASE_NAME=wagtail.db pipenv run python -u runtests.py
 
   frontend:
diff --git a/Makefile b/Makefile
index baf49884a2..4ddce6ebe2 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,9 @@ develop: clean-pyc
 lint:
 	flake8 wagtail
 	isort --check-only --diff --recursive wagtail
-	jinjalint --parse-only wagtail || true
+	# Filter out known false positives, while preserving normal output and error codes.
+	# See https://github.com/motet-a/jinjalint/issues/18.
+	jinjalint --parse-only wagtail | grep -v 'welcome_page.html:6:70' | tee /dev/tty | wc -l | grep -q '0'
 	npm run lint:css --silent
 	npm run lint:js --silent