diff --git a/tox.ini b/tox.ini
index 478b267a77..2e4812312e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 1.6
 skipsdist = True
-envlist = py34,py27,pep8,pypy
+envlist = py34,py27,linters,pypy
 
 [testenv]
 usedevelop=True
@@ -24,26 +24,12 @@ commands =
   {toxinidir}/tools/validate-all-yaml.sh
   {toxinidir}/tools/validate-all-maintainer.sh
 
-[testenv:pep8]
-commands =
-  flake8
-
 [testenv:venv]
 commands = {posargs}
 
 [testenv:docs]
 commands = python setup.py build_sphinx
 
-[testenv:validate-contents]
-commands =
-  {toxinidir}/tools/validate-all-json.sh
-  {toxinidir}/tools/validate-all-yaml.sh
-  {toxinidir}/tools/validate-all-maintainer.sh
-
-[testenv:bashate]
-commands =
-  {toxinidir}/tools/run-bashate.sh
-
 [testenv:setupenv]
 whitelist_externals = bash
 commands = bash -c tests/setup_gate.sh