diff --git a/tox.ini b/tox.ini
index 2ddaee1..7ec660e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,10 @@
 [tox]
-envlist = pep8
+envlist = pep8, pyflakes
 
 [testenv:pep8]
 deps = pep8
 commands = pep8 --repeat --show-source zuul zuul-server setup.py
+
+[testenv:pyflakes]
+deps = pyflakes
+commands = pyflakes zuul zuul-server setup.py