diff --git a/Makefile.local b/Makefile.local
index e098abb8..2c191583 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -1,89 +1,97 @@
 TEST_DIRS := ./swh/web/tests
 TESTFLAGS = --hypothesis-profile=swh-web-fast
 TESTFULL_FLAGS = --hypothesis-profile=swh-web
 YARN ?= yarn
 
 yarn-install: package.json
 	$(YARN) install
 
 .PHONY: build-webpack-dev
 build-webpack-dev: yarn-install
 	$(YARN) build-dev
 
 .PHONY: build-webpack-test
 build-webpack-test: yarn-install
 	$(YARN) build-test
 
 .PHONY: build-webpack-dev-no-verbose
 build-webpack-dev-no-verbose: yarn-install
 	$(YARN) build-dev >/dev/null
 
 .PHONY: build-webpack-prod
 build-webpack-prod: yarn-install
 	$(YARN) build
 
 .PHONY: run-migrations
 run-migrations:
 	python3 swh/web/manage.py migrate --settings=swh.web.settings.development -v0 2>/dev/null
 	python3 swh/web/manage.py createcachetable --settings=swh.web.settings.development -v0 2>/dev/null
 
 .PHONY: run-migrations-prod
 run-migrations-prod:
 	django-admin migrate --settings=swh.web.settings.production -v0 2>/dev/null
 	django-admin createcachetable --settings=swh.web.settings.production -v0 2>/dev/null
 
 .PHONY: run-migrations-test
 run-migrations-test:
 	rm -f swh/web/settings/testdb.sqlite3
 	django-admin migrate --settings=swh.web.settings.tests -v0 2>/dev/null
 	django-admin createcachetable --settings=swh.web.settings.tests -v0 2>/dev/null
 	cat swh/web/tests/create_test_admin.py | django-admin shell --settings=swh.web.settings.tests
 
 .PHONY: clear-memcached
 clear-memcached:
 	echo "flush_all" | nc -q 2 localhost 11211 2>/dev/null
 
 run-django-webpack-devserver: run-migrations yarn-install
 	bash -c "trap 'trap - SIGINT SIGTERM ERR; kill %1' SIGINT SIGTERM ERR; $(YARN) start-dev & sleep 10 && cd swh/web && python3 manage.py runserver --nostatic --settings=swh.web.settings.development"
 
 run-django-webpack-dev: build-webpack-dev run-migrations
 	python3 swh/web/manage.py runserver --nostatic --settings=swh.web.settings.development
 
 run-django-webpack-prod: build-webpack-prod run-migrations-prod clear-memcached
 	python3 swh/web/manage.py runserver --nostatic --settings=swh.web.settings.production
 
 run-django-server-dev: run-migrations
 	python3 swh/web/manage.py runserver --nostatic --settings=swh.web.settings.development
 
 run-django-server-prod: run-migrations-prod clear-memcached
 	python3 swh/web/manage.py runserver --nostatic --settings=swh.web.settings.production
 
 run-gunicorn-server: run-migrations clear-memcached
 	DJANGO_SETTINGS_MODULE=swh.web.settings.production \
 		gunicorn3 -b 127.0.0.1:5004 'django.core.wsgi:get_wsgi_application()'
 
 run-django-webpack-memory-storages: build-webpack-dev run-migrations
 	python3 swh/web/manage.py runserver --nostatic --settings=swh.web.settings.tests
 
 test-full:
 	$(TEST) $(TESTFULL_FLAGS) $(TEST_DIRS)
 
 .PHONY: test-frontend-cmd
 test-frontend-cmd: build-webpack-test run-migrations-test
 	python3 swh/web/manage.py runserver --nostatic --settings=swh.web.settings.tests & sleep 10 && $(YARN) run cypress run ; pkill -P $$! ; $(YARN) run mochawesome
 
 test-frontend: export CYPRESS_SKIP_SLOW_TESTS=1
 test-frontend: test-frontend-cmd
 
 test-frontend-full: export CYPRESS_SKIP_SLOW_TESTS=0
 test-frontend-full: test-frontend-cmd
 
 .PHONY: test-frontend-ui-cmd
 test-frontend-ui-cmd: build-webpack-test run-migrations-test
 	bash -c "trap 'trap - SIGINT SIGTERM ERR EXIT; jobs -p | head -1 | xargs pkill -P' SIGINT SIGTERM ERR EXIT; python3 swh/web/manage.py runserver --nostatic --settings=swh.web.settings.tests & sleep 10 && $(YARN) run cypress open"
 
 test-frontend-ui: export CYPRESS_SKIP_SLOW_TESTS=1
 test-frontend-ui: test-frontend-ui-cmd
 
 test-frontend-full-ui: export CYPRESS_SKIP_SLOW_TESTS=0
 test-frontend-full-ui: test-frontend-ui-cmd
+
+
+# Override default rule to make sure DJANGO env var is properly set. It
+# *should* work without any override thanks to the mypy django-stubs plugin,
+# but it currently doesn't; see
+# https://github.com/typeddjango/django-stubs/issues/166
+typecheck:
+	DJANGO_SETTINGS_MODULE=swh.web.settings.tests $(MYPY) $(MYPYFLAGS) swh
diff --git a/mypy.ini b/mypy.ini
index 517639ab..8bad69c3 100644
--- a/mypy.ini
+++ b/mypy.ini
@@ -1,52 +1,52 @@
 [mypy]
 namespace_packages = True
 warn_unused_ignores = True
 
 
-# # support for django magic: https://github.com/typeddjango/django-stubs
-# plugins = mypy_django_plugin.main
+# support for django magic: https://github.com/typeddjango/django-stubs
+plugins = mypy_django_plugin.main
 
-# [mypy.plugins.django-stubs]
-# django_settings_module = swh.web.settings.tests
+[mypy.plugins.django-stubs]
+django_settings_module = swh.web.settings.tests
 
 
 # 3rd party libraries without stubs (yet)
 
 [mypy-bs4.*]
 ignore_missing_imports = True
 
 [mypy-django_js_reverse.*]
 ignore_missing_imports = True
 
 [mypy-htmlmin.*]
 ignore_missing_imports = True
 
 [mypy-magic.*]
 ignore_missing_imports = True
 
 [mypy-pkg_resources.*]
 ignore_missing_imports = True
 
 [mypy-pygments.*]
 ignore_missing_imports = True
 
 [mypy-pypandoc.*]
 ignore_missing_imports = True
 
 [mypy-pytest.*]
 ignore_missing_imports = True
 
 [mypy-rest_framework.*]
 ignore_missing_imports = True
 
 [mypy-requests_mock.*]
 ignore_missing_imports = True
 
 [mypy-sphinx.*]
 ignore_missing_imports = True
 
 [mypy-sphinxcontrib.*]
 ignore_missing_imports = True
 
 [mypy-swh.docs.*]
 ignore_missing_imports = True