diff --git a/.zuul.yaml b/.zuul.yaml
index d4a4151d52..c1f155144f 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -203,7 +203,7 @@
       jobs:
         - zuul-build-image
         - zuul-tox-docs
-        - tox-pep8
+        - tox-linters
         - tox-py35:
             irrelevant-files:
               - zuul/cmd/migrate.py
@@ -259,7 +259,7 @@
       jobs:
         - zuul-upload-image
         - zuul-tox-docs
-        - tox-pep8
+        - tox-linters
         - tox-py35:
             irrelevant-files:
               - zuul/cmd/migrate.py
diff --git a/tox.ini b/tox.ini
index 485bf10c91..103a92cf75 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 3.2
 skipsdist = True
-envlist = pep8,py3{-docker}
+envlist = linters,py3{-docker}
 ignore_basepython_conflict = True
 # TODO(stephenfin): It would be good to set 'requires = tox-docker', but doing
 # so borks the tools/pip.sh wrapper we're using here and probably isn't what
@@ -45,7 +45,7 @@ install_command = pip install {opts} {packages}
 deps = bindep
 commands = bindep test
 
-[testenv:pep8]
+[testenv:linters]
 install_command = pip install {opts} {packages}
 # --ignore-missing-imports tells mypy to not try to follow imported modules
 # out of the current tree. As you might expect, we don't want to run static