diff --git a/.travis/after_success.sh b/.travis/after_success.sh
index 15c253e43..1026ce3c8 100755
--- a/.travis/after_success.sh
+++ b/.travis/after_success.sh
@@ -16,12 +16,12 @@ coveralls-merge coverage.c.json
 codecov
 
 if [ "$DOCKER" == "" ]; then
-    pip install pep8 pyflakes
-    pep8 --statistics --count PIL/*.py
-    pep8 --statistics --count Tests/*.py
+    pip install pyflakes pycodestyle
     pyflakes *.py       | tee >(wc -l)
     pyflakes PIL/*.py   | tee >(wc -l)
     pyflakes Tests/*.py | tee >(wc -l)
+    pycodestyle --statistics --count PIL/*.py
+    pycodestyle --statistics --count Tests/*.py
 fi
 
 if [ "$TRAVIS_PYTHON_VERSION" == "2.7" ] && [ "$DOCKER" == "" ]; then
diff --git a/requirements.txt b/requirements.txt
index 3c57ea71d..213f145ab 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,7 +14,7 @@ MarkupSafe
 nose
 nose-cov
 olefile
-pep8
+pycodestyle
 pyflakes
 Pygments
 pyroma