diff --git a/src/bin/pegleg/tox.ini b/src/bin/pegleg/tox.ini
index c52c1249..9c012686 100644
--- a/src/bin/pegleg/tox.ini
+++ b/src/bin/pegleg/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py35, pep8
+envlist = py35, py36, pep8
 skipsdist = True
 
 [testenv]
diff --git a/tox.ini b/tox.ini
index e105634a..94375228 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py35, pep8, docs
+envlist = py35, py36, 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
@@ -16,6 +16,12 @@ commands =
     tox -c src/bin/pegleg/tox.ini -e py35
 whitelist_externals = tox
 
+[testenv:py36]
+commands =
+    # Run all unit tests under src/bin/pegleg
+    tox -c src/bin/pegleg/tox.ini -e py36
+whitelist_externals = tox
+
 [testenv:fmt]
 commands =
     tox -c src/bin/pegleg/tox.ini -e fmt