diff --git a/Makefile b/Makefile
index 885c9643..7a32fc54 100644
--- a/Makefile
+++ b/Makefile
@@ -71,7 +71,7 @@ clean:
 
 .PHONY: py_lint
 py_lint:
-	cd src/bin/pegleg;tox -e lint
+	cd src/bin/pegleg;tox -e pep8
 
 .PHONY: py_format
 py_format:
diff --git a/src/bin/pegleg/tox.ini b/src/bin/pegleg/tox.ini
index c6795d50..cce83074 100644
--- a/src/bin/pegleg/tox.ini
+++ b/src/bin/pegleg/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py35, lint
+envlist = py35, pep8
 skipsdist = True
 
 [testenv]
@@ -19,7 +19,7 @@ deps = yapf==0.20.0
 commands =
     yapf --style=pep8 -ir {toxinidir}/pegleg {toxinidir}/tests
 
-[testenv:lint]
+[testenv:pep8]
 deps =
     yapf==0.20.0
     flake8==3.5.0
diff --git a/tox.ini b/tox.ini
index 91069dd4..9e1c2902 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py35, lint, docs
+envlist = py35, pep8, docs
 # Allows docs to be built without setup.py having to exist. Requires that
 # usedevelop be False as well (which it is by default).
 skipsdist = True
@@ -20,7 +20,7 @@ commands =
     tox -c src/bin/pegleg/tox.ini -e fmt
 whitelist_externals = tox
 
-[testenv:lint]
+[testenv:pep8]
 commands =
     tox -c src/bin/pegleg/tox.ini -e lint
 whitelist_externals = tox