1 files changed, 14 insertions, 3 deletions
diff --git a/tox.ini b/tox.ini
index 5ff08779..3ee449f1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -22,22 +22,33 @@ commands =
     sphinx-build -W -b html -d {envtmpdir}/doctrees docs docs/_build/html
     sphinx-build -W -b latex -d {envtmpdir}/doctrees docs docs/_build/latex
     sphinx-build -W -b doctest -d {envtmpdir}/doctrees docs docs/_build/html
-    sphinx-build -W -b linkcheck docs docs/_build/html
     sphinx-build -W -b spelling docs docs/_build/html
 
+[testenv:docs-linkcheck]
+deps =
+    sphinx
+basepython = python2.7
+commands =
+    sphinx-build -W -b linkcheck docs docs/_build/html
+
 # Temporarily disable coverage on pypy because of performance problems with
 # coverage.py on pypy.
 [testenv:pypy]
 commands = py.test --capture=no --strict {posargs}
 
 [testenv:pep8]
-deps = flake8
+deps =
+    flake8
+    pep8-naming
 commands = flake8 .
 
 [testenv:py3pep8]
 basepython = python3.3
-deps = flake8
+deps =
+    flake8
+    pep8-naming
 commands = flake8 .
 
 [flake8]
 exclude = .tox,*.egg
+select = E,W,F,N