diff --git a/.travis.yml b/.travis.yml
index b298424..76d34b5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -76,9 +76,9 @@ install:
   - pip install -r requirements.txt
 
 script:
-    # pep8 tests
-  - pep8 --ignore E501 update.py
-  - pep8 --ignore E501,E265 autocmake
+    # pycodestyle tests
+  - pycodestyle --ignore E501 update.py
+  - pycodestyle --ignore E501,E265 autocmake
     # unit tests
   - py.test -vv autocmake/*
   - py.test -vv test/test.py
diff --git a/doc/contributors/testing.rst b/doc/contributors/testing.rst
index d320fca..99345c3 100644
--- a/doc/contributors/testing.rst
+++ b/doc/contributors/testing.rst
@@ -11,8 +11,8 @@ build and test recipe for other requirements.
 Your contributions and changes should preserve the test set and be PEP8 conform.
 You can run locally all tests with::
 
-  $ pep8 --ignore E501 update.py
-  $ pep8 --ignore E501,E265 autocmake
+  $ pycodestyle --ignore E501 update.py
+  $ pycodestyle --ignore E501,E265 autocmake
   $ py.test -vv autocmake/*
   $ py.test -vv test/test.py
 
diff --git a/requirements.txt b/requirements.txt
index 35fd7f8..4d214d3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,3 @@
-pep8
+pycodestyle
 pytest
 pyyaml