diff --git a/requirements.txt b/requirements.txt
index 241520d46..05735a120 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -21,6 +21,6 @@ pytest
 pytest-django
 pytest-sugar
 pytest-env
-pep8
+pycodestyle
 flake8
 tox
diff --git a/src/tox.ini b/src/tox.ini
index 85d7b5c95..4ea231f46 100644
--- a/src/tox.ini
+++ b/src/tox.ini
@@ -5,15 +5,18 @@
 
 [tox]
 skipsdist = True
-envlist = py34, py35, py36, pep8
+envlist = py34, py35, py36, pycodestyle
 
 [testenv]
 commands = pytest
 deps = -r{toxinidir}/../requirements.txt
 
-[testenv:pep8]
-commands=pep8
-deps=pep8
+[testenv:pycodestyle]
+commands=pycodestyle
+deps=pycodestyle
 
-[pep8]
-exclude=.tox,migrations,paperless/settings.py
+[pycodestyle]
+exclude=
+  .tox,
+  migrations,
+  paperless/settings.py