diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2c84353..c66a290 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,11 +10,11 @@ jobs:
       - run:
           command: |
             sudo python -m pip install --upgrade pip setuptools wheel
-            sudo python -m pip install --upgrade pep8 pyflakes coverage tox
+            sudo python -m pip install --upgrade pycodestyle pyflakes coverage tox
             sudo python -m pip install --upgrade virtualenv==12.0.2
       - run:
           command: |
-            tox -e py27,py350,pep8,pyflakes,coverage
+            tox -e py27,py350,pycodestyle,pyflakes,coverage
             sudo python setup.py develop
       - deploy:
           name: Push coverage
diff --git a/setup.cfg b/setup.cfg
index 9b303f5..dcdf8b2 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -4,5 +4,5 @@
 # will need to generate wheels for each Python version that you support.
 universal=1
 
-[pep8]
+[pycodestyle]
 max_line_length = 120
diff --git a/tox.ini b/tox.ini
index 7e90f14..4b58c85 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,16 +1,16 @@
 [tox]
-envlist = py27, py350, pep8, pyflakes
+envlist = py27, py350, pycodestyle, pyflakes
 
 [testenv]
 commands = {envpython} -m unittest discover -s tests -p "*test*"
 deps = requests
 usedevelop = true
 
-[testenv:pep8]
+[testenv:pycodestyle]
 deps =
-    pep8
+    pycodestyle
 commands =
-    {envpython} -m pep8 src
+    {envpython} -m pycodestyle src
 
 [testenv:pyflakes]
 deps =