diff --git a/tox.ini b/tox.ini
index 2267e15..15218a1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,6 @@
 [tox]
-envlist = py26,py27,py32,py33,py34,py35
+minversion=2.3.1
+envlist = py26,py27,py32,py33,py34,py35,flake8
 
 [testenv]
 deps =
@@ -8,6 +9,16 @@ deps =
 commands =
     py.test {posargs}
 
+[testenv:flake8]
+skipsdist = true
+skip_install = true
+use_develop = false
+deps =
+    flake8
+    flake8-docstrings
+commands =
+    flake8
+
 [flake8]
 # Ignore some flake8-docstrings errors
 ignore = D203