diff --git a/.gitignore b/.gitignore
index c49070f13..f1dc3167c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ TAGS
 .tags
 .tox
 .venv
+.coverage
 .DS_Store
 sphinx/pycode/Grammar*pickle
 distribute-*
diff --git a/tox.ini b/tox.ini
index b7d4feb98..519020f98 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,15 +6,16 @@ passenv = https_proxy http_proxy no_proxy
 deps=
     six
     pytest
+    pytest-cov
     html5lib
     mock
     enum34
     typing
 setenv =
     SPHINX_TEST_TEMPDIR = {envdir}/testbuild
-    PYTHONDONTWRITEBYTECODE = true
 commands=
-    {envpython} -Wall tests/run.py --ignore tests/py35 {posargs}
+    {envpython} -Wall tests/run.py --ignore tests/py35 --cov=sphinx \
+        --durations 25 {posargs}
     sphinx-build -q -W -b html -d {envtmpdir}/doctrees doc {envtmpdir}/html
 
 [testenv:pypy]
@@ -46,6 +47,13 @@ deps=
 deps=flake8
 commands=flake8
 
+[testenv:pylint]
+deps=
+    pylint
+    {[testenv]deps}
+commands=
+    pylint --rcfile utils/pylintrc sphinx
+
 [testenv:py27]
 deps=
     {[testenv]deps}
@@ -56,10 +64,11 @@ deps=
     typed_ast
     {[testenv]deps}
 commands=
-    {envpython} -Wall tests/run.py {posargs}
+    {envpython} -Wall tests/run.py --cov=sphinx --durations 25 {posargs}
     sphinx-build -q -W -b html -d {envtmpdir}/doctrees doc {envtmpdir}/html
 
 [testenv:mypy]
+basepython=python3
 deps=
     mypy
 commands=
@@ -67,4 +76,4 @@ commands=
 
 [testenv:docs]
 commands=
-    python setup.py build_sphinx
+    python setup.py build_sphinx {posargs}