diff --git a/tox.ini b/tox.ini
index 637c39a..ce49502 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist=py26,py27,py33,py34,pypy
+envlist=py26,py27,py33,py34,pypy,flake8
 
 [testenv]
 commands=py.test --cov rq {posargs}
@@ -14,3 +14,10 @@ deps=
     pytest-cov
     unittest2
     mock
+
+[testenv:flake8]
+basepython = python2.7
+deps =
+    flake8
+commands =
+    flake8 rq tests --max-line-length=120