diff --git a/.travis.yml b/.travis.yml
index 4207f8d08bd..2d9bbabe101 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,7 @@ sudo: false
 install:
   - "pip install coveralls"
   - "pip install pep8"
+  - "pip install flake8"
 
 before_install:
   # Need this for the git tests to succeed.
@@ -25,6 +26,8 @@ script:
   # Checks if the file that have been changed are pep8 conformant
   - CHANGED_PYTHON_FILES=`git diff develop... --name-only | perl -ne 'print if /\.py/g'`
   - if [[ ${CHANGED_PYTHON_FILES} ]] ; then pep8 --max-line-length=120 ${CHANGED_PYTHON_FILES} ; fi
+  - if [[ ${CHANGED_PYTHON_FILES} ]] ; then flake8 --format pylint --config flake8.ini ${CHANGED_PYTHON_FILES} ; fi
+
 
 after_success:
   - coveralls
diff --git a/flake8.ini b/flake8.ini
new file mode 100644
index 00000000000..757c71705e5
--- /dev/null
+++ b/flake8.ini
@@ -0,0 +1,3 @@
+[flake8]
+ignore = W391,F403
+max-line-length = 120
\ No newline at end of file