diff --git a/.travis.yml b/.travis.yml
index 5049c20313..71736cd150 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ install:
     - pip install -q -r src/requirements.txt
 before_script:
     - cd src
-    - "pep8 --ignore=E501,E128 --exclude=migrations ."
-    - pyflakes .
+    - flake8 --ignore=E128,F403,F401 .
+    - python manage.py validate
 script:
     - python manage.py test
diff --git a/src/requirements.txt b/src/requirements.txt
index 9d221a8efc..4cba13667d 100644
--- a/src/requirements.txt
+++ b/src/requirements.txt
@@ -1,3 +1,5 @@
 Django>=1.7
 pyflakes
 pep8
+pep8-naming
+flake8
diff --git a/src/setup.cfg b/src/setup.cfg
new file mode 100644
index 0000000000..ec50166d36
--- /dev/null
+++ b/src/setup.cfg
@@ -0,0 +1,5 @@
+[flake8]
+ignore = E128
+max-line-length = 160
+exclude = tests,migrations,.ropeproject
+max-complexity = 12