diff --git a/tox.ini b/tox.ini
index c0a9ff4bf4..537da1d380 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 1.6
 skipsdist = True
-envlist = py34,py27,linters,pypy
+envlist = py34,py27,pep8,pypy
 
 [testenv]
 usedevelop=True
@@ -16,7 +16,17 @@ commands =
   find . -type f -name "*.pyc" -delete
   python setup.py test --slowest --testr-args='{posargs}'
 
+[testenv:pep8]
+commands =
+  {toxinidir}/tools/run-bashate.sh
+  flake8 {posargs}
+  {toxinidir}/tools/validate-all-json.sh
+  {toxinidir}/tools/validate-all-yaml.sh
+  {toxinidir}/tools/validate-all-maintainer.sh
+
 [testenv:linters]
+# temporary environment until infra jobs are changed.
+# TODO(jaegerandi): remove this
 commands =
   {toxinidir}/tools/run-bashate.sh
   flake8 {posargs}