diff --git a/.travis.yml b/.travis.yml
index 9894ee4ec..ececf3e9d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,6 +19,7 @@ install:
   - pip install Pillow==2.3.0
   - pip install django-guardian==1.2.3
   - pip install pytest-django==2.6.1
+  - pip install flake8==2.2.2
   - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install oauth2==1.5.211; fi"
   - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth-plus==2.2.4; fi"
   - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth2-provider==0.2.4; fi"
diff --git a/requirements-test.txt b/requirements-test.txt
index a91dd0d4b..411daeba2 100644
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -2,6 +2,7 @@
 pytest-django==2.6
 pytest==2.5.2
 pytest-cov==1.6
+flake8==2.2.2
 
 # Optional packages
 markdown>=2.1.0
diff --git a/tox.ini b/tox.ini
index 200dad38d..6f588de12 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,6 +13,7 @@ commands = ./runtests.py --fast
 [testenv:flake8]
 basepython = python2.7
 deps = pytest==2.5.2
+       flake8==2.2.2
 commands = ./runtests.py --lintonly
 
 [testenv:py3.4-django1.7]