diff --git a/Makefile b/Makefile
index 646870e09..7997a9270 100644
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,7 @@ help: ## display this help message
 
 quality: ## check coding style with pycodestyle and pylint
 	pycodestyle
+	mypy
 	pylint xblock
 
 validate: test
diff --git a/mypy.ini b/mypy.ini
new file mode 100644
index 000000000..9435d230b
--- /dev/null
+++ b/mypy.ini
@@ -0,0 +1,10 @@
+[mypy]
+follow_imports = normal
+ignore_missing_imports = False
+allow_untyped_globals = False
+files =
+	xblock
+
+# Ignore web_fragments typing until it has hints.
+[mypy-web_fragments.*]
+ignore_missing_imports = True
diff --git a/requirements/test.in b/requirements/test.in
index 4a5d2a57b..4bcdd6097 100644
--- a/requirements/test.in
+++ b/requirements/test.in
@@ -8,9 +8,12 @@ astroid
 coverage
 ddt
 diff-cover >= 0.2.1
+django-stubs
 edx_lint
 hypothesis
+lxml-stubs
 mock
+mypy
 path
 pycodestyle
 pylint
@@ -18,3 +21,9 @@ pytest
 pytest-cov
 pytest-django
 tox
+types-python-dateutil
+types-pytz
+types-PyYAML
+types-setuptools
+types-simplejson
+types-WebOb