diff --git a/tox.ini b/tox.ini
index d2cc147..fde5a50 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = py27,linters
+envlist = py27,pep8
 skipsdist = True
 
 [testenv]
@@ -20,6 +20,12 @@ commands = python setup.py testr --coverage --testr-args='{posargs}'
 [testenv:genconfig]
 commands = oslo-config-generator --config-file=etc/terracotta-config-generator.conf
 
+[testenv:pep8]
+commands =
+  bash tools/flake8wrap.sh {posargs}
+
+# Temporary environment until infra jobs are changed.
+# TODO(jaegerandi): remove this
 [testenv:linters]
 commands =
   bash tools/flake8wrap.sh {posargs}