diff --git a/.travis.yml b/.travis.yml
index 0bda7276d..4ef18923f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,14 +15,17 @@ os:
 env:
   - VIA=compile LC_ALL=en_US.ascii 
   - VIA=compile
+  - VIA=flake8
   #- VIA=pypi_nightly
 
 install:
   - "./travis.sh"
+  - pip install flake8
 
 script:
   - "pip install pytest pytest-timeout"
   - if [[ "${VIA}" == "compile" ]]; then python -m pytest --tb=native spacy; fi
+  - if [[ "${VIA}" == "flake8" ]]; then flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics; fi  
   - if [[ "${VIA}" == "pypi_nightly" ]]; then python -m pytest --tb=native --models --en `python -c "import os.path; import spacy; print(os.path.abspath(os.path.dirname(spacy.__file__)))"`; fi
   - if [[ "${VIA}" == "sdist" ]]; then python -m pytest --tb=native `python -c "import os.path; import spacy; print(os.path.abspath(os.path.dirname(spacy.__file__)))"`; fi