diff --git a/setup.cfg b/setup.cfg
index 96111b23..c75d366d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -6,3 +6,4 @@ max-line-length = 100
 ignore =
   # do not use bare 'except'
   E722,
+exclude = test/*
diff --git a/setup.py b/setup.py
index d964d541..ec091b66 100755
--- a/setup.py
+++ b/setup.py
@@ -39,6 +39,9 @@ setup(name='jedi',
               # coloroma for colored debug output
               'colorama',
           ],
+          'qa': [
+              'flake8==3.5.0',
+          ],
       },
       package_data={'jedi': ['evaluate/compiled/fake/*.pym']},
       platforms=['any'],
diff --git a/tox.ini b/tox.ini
index 92d61f87..cfec4cd0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py34, py35, py36
+envlist = py27, py34, py35, py36, qa
 [testenv]
 extras = testing
 # Overwrite the parso version (only used sometimes).
@@ -46,3 +46,7 @@ commands =
 commands =
     {envpython} -c "import os; a='{envtmpdir}'; os.path.exists(a) or os.makedirs(a)"
     {envpython} sith.py --record {envtmpdir}/record.json random {posargs:jedi}
+[testenv:qa]
+commands = flake8 {posargs:jedi}
+deps =
+extras = qa