diff --git a/ci-build.sh b/ci-build.sh
index ae9f04c..463a269 100755
--- a/ci-build.sh
+++ b/ci-build.sh
@@ -2,14 +2,14 @@
 
 python3 --version
 py.test --version
-python3 -mpep8 --version
+python3 -mpycodestyle --version
 
 # Target directory for all build files
 BUILD=${1:-ci-build}
 rm -rf ${BUILD}/
 mkdir -p $BUILD
 
-python3 -mpep8 --ignore E501 i3pystatus tests
+python3 -mpycodestyle --ignore E501 i3pystatus tests
 
 # Check that the setup.py script works
 rm -rf ${BUILD}/test-install ${BUILD}/test-install-bin
diff --git a/dev-requirements.txt b/dev-requirements.txt
index d4ff798..485b456 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -2,5 +2,5 @@ pytest>=2.5
 sphinx>=1.1
 colour>=0.0.5
 mock>=1.0
-pep8>=1.5.7
+pycodestyle>=1.5.7
 i3ipc>=1.2.0