diff --git a/.travis.yml b/.travis.yml
index 77029736b75d..b9ff97434fcf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,7 +57,7 @@ env:
     - PYPARSING=pyparsing
     - PYTEST='pytest>=3.4'
     - PYTEST_COV=pytest-cov
-    - PYTEST_PEP8=
+    - PYTEST_FLAKE8=
     - SPHINX=sphinx
     # Variables controlling the test run.
     - DELETE_FONT_CACHE=
@@ -65,9 +65,9 @@ env:
     - NPROC=2
     - OPENBLAS_NUM_THREADS=1
     - PYTHONFAULTHANDLER=1
-    - PYTEST_ARGS="-rawR --maxfail=50 --timeout=300 --durations=25 --cov-report= --cov=lib -n $NPROC"
+    - RUN_FLAKE8=
+    - PYTEST_ARGS="-rawR --maxfail=50 --timeout=350 --durations=25 --cov-report= --cov=lib -n $NPROC"
     - PYTHON_ARGS=
-    - RUN_PEP8=
 
 matrix:
   include:
@@ -86,7 +86,7 @@ matrix:
     - python: 3.5
       env: PYTHON_ARGS=-OO
     - python: 3.6
-      env: DELETE_FONT_CACHE=1 PANDAS='pandas<0.21.0' PYTEST_PEP8=pytest-pep8 RUN_PEP8=--pep8
+      env: DELETE_FONT_CACHE=1 PANDAS='pandas<0.21.0' PYTEST_FLAKE8=pytest-flake8 RUN_FLAKE8=--flake8
     - python: "nightly"
       env: PRE=--pre
     - os: osx
@@ -171,7 +171,7 @@ install:
         $PYTEST \
         $PYTEST_COV \
         pytest-faulthandler \
-        $PYTEST_PEP8 \
+        $PYTEST_FLAKE8 \
         pytest-rerunfailures \
         pytest-timeout \
         pytest-xdist
diff --git a/ci/travis/test_script.sh b/ci/travis/test_script.sh
index f6446d21f16d..3dda55db9ff2 100755
--- a/ci/travis/test_script.sh
+++ b/ci/travis/test_script.sh
@@ -15,6 +15,6 @@ if [[ $DELETE_FONT_CACHE == 1 ]]; then
   rm -rf ~/.cache/matplotlib
 fi
 
-echo The following args are passed to pytest $PYTEST_ARGS $RUN_PEP8
+echo The following args are passed to pytest $PYTEST_ARGS $RUN_FLAKE8
 
-python -mpytest $PYTEST_ARGS $RUN_PEP8
+python -mpytest $PYTEST_ARGS $RUN_FLAKE8
diff --git a/pytest.ini b/pytest.ini
index c3b723fe29c8..860a9970a2fe 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -7,8 +7,9 @@ markers =
     network: Mark a test that uses the network.
     style: Set alternate Matplotlib style temporarily.
 
-pep8ignore =
-    * E111 E114 E115 E116 E121 E122 E123 E124 E125 E126 E127 E128 E129 E131 E226 E240 E241 E242 E243 E244 E245 E246 E247 E248 E249 E265 E266 E704 W503
+flake8-max-line-length = 80
+flake8-ignore =
+    * E111 E114 E115 E116 E121 E122 E123 E124 E125 E126 E127 E128 E129 E131 E226 E240 E241 E242 E243 E244 E245 E246 E247 E248 E249 E265 E266 E305 E306 E704 E722 E741 F401 F403 F811 F841 W503
 
     tools/boilerplate.py E501
     setup.py E402