diff --git a/setup.py b/setup.py
index 6d21e2a..2d9375c 100755
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from setuptools import setup, find_packages
+from setuptools import find_packages, setup
 
 
 setup(
@@ -7,7 +7,8 @@ setup(
     version="1.9.0",
     author="Amr Hassan <amr.hassan@gmail.com>",
     install_requires=['six'],
-    tests_require=['mock', 'pytest', 'coverage', 'pep8', 'pyyaml', 'pyflakes'],
+    tests_require=['mock', 'pytest', 'coverage', 'pycodestyle', 'pyyaml',
+                   'pyflakes'],
     description=("A Python interface to Last.fm and Libre.fm"),
     author_email="amr.hassan@gmail.com",
     url="https://github.com/pylast/pylast",
diff --git a/tox.ini b/tox.ini
index 33c73be..8300509 100644
--- a/tox.ini
+++ b/tox.ini
@@ -23,22 +23,22 @@ commands = {posargs}
 
 [testenv:py2lint]
 deps =
-     pep8
+     pycodestyle
      pyflakes
      clonedigger
 commands =
     pyflakes pylast
     pyflakes tests
-    pep8 pylast
-    pep8 tests
+    pycodestyle pylast
+    pycodestyle tests
     ./clonedigger.sh
 
 [testenv:py3lint]
 deps =
-     pep8
+     pycodestyle
      pyflakes
 commands =
     pyflakes pylast
     pyflakes tests
-    pep8 pylast
-    pep8 tests
+    pycodestyle pylast
+    pycodestyle tests