2 files changed, 8 insertions, 1 deletions

diff --git a/test-requirements.txt b/test-requirements.txt
index b0d4ff8d1..b284591b9 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -8,3 +8,4 @@
 coverage==4.1
 mock==1.3.0
 nose==1.3.7
+flake8>=2.5.4,<2.6.0 # MIT
diff --git a/tox.ini b/tox.ini
index d7da122af..88d720c8c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27
+envlist = pep8,py27
 
 [testenv]
 deps =
@@ -12,3 +12,9 @@ commands = nosetests --with-xunit \
   --cover-xml \
   --cover-html \
   functest/tests/unit
+
+[testenv:pep8]
+basepython = python2.7
+deps =
+  {[testenv]deps}
+commands = flake8