diff --git a/Tools/travis-linux-install.sh b/Tools/travis-linux-install.sh
index 5704c4c28..110bd8b70 100755
--- a/Tools/travis-linux-install.sh
+++ b/Tools/travis-linux-install.sh
@@ -89,7 +89,7 @@ case "$SWIGLANG" in
 		travis_retry sudo apt-get -qq install php$VER-cli php$VER-dev
 		;;
 	"python")
-		pip install --user pep8
+		pip install --user pycodestyle
 		if [[ "$PY3" ]]; then
 			travis_retry sudo apt-get install -qq python3-dev
 		fi
diff --git a/configure.ac b/configure.ac
index 85b24e701..cd5992d02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -895,9 +895,9 @@ else
 fi
 
 if test -n "$PYINCLUDE" || test -n "$PY3INCLUDE" ; then
-  AC_CHECK_PROGS(PEP8, pep8)
+  AC_CHECK_PROGS(PEP8, pycodestyle)
   if test -n "$PEP8"; then
-    AC_MSG_CHECKING(pep8 version)
+    AC_MSG_CHECKING(pycodestyle version)
     pep8_version=`$PEP8 --version 2>/dev/null`
     AC_MSG_RESULT($pep8_version)
   fi