diff --git a/tox.ini b/tox.ini
index 50ec75b0..9cfb5a4d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -21,12 +21,16 @@ commands=
     python setup.py build_sphinx
 
 [testenv:pep8]
+# This runs all lint like jobs
 basepython = python2.7
 deps =
   flake8
   {[testenv]deps}
 commands=
   bash tools/flake8wrap.sh
+  doc8 -e .rst doc/source
+  {[testenv:jsonlint]commands}
+  {[testenv:jsonschema]commands}
 whitelist_externals =
   sh
   bash