diff --git a/script/lint b/script/lint
index 91e6d60..431ac4e 100755
--- a/script/lint
+++ b/script/lint
@@ -17,5 +17,5 @@ fi
 
 SOURCES="*.py octodns/*.py octodns/*/*.py tests/*.py"
 
-pep8 --ignore=E221,E241,E251 $SOURCES
+pycodestyle --ignore=E221,E241,E251,E722 $SOURCES
 pyflakes $SOURCES
diff --git a/setup.cfg b/setup.cfg
index 54e9014..31a0283 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -62,7 +62,7 @@ test =
     coverage
     mock
     nose
-    pep8
+    pycodestyle
     pyflakes
     requests_mock
     setuptools>=36.4.0