diff --git a/tox.ini b/tox.ini
index 807ce26..2e578af 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,linters
+envlist = py26,py27,pep8
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
@@ -19,10 +19,16 @@ whitelist_externals = *
 [testenv:venv]
 commands = {posargs}
 
+# Temporary environment until infra jobs are changed.
+# TODO(jaegerandi): remove this
 [testenv:linters]
 commands = flake8
 distribute = false
 
+[testenv:pep8]
+commands = flake8
+distribute = false
+
 [flake8]
 ignore = H703,H102,E265,E262,H233
 show-source = true