diff --git a/tox.ini b/tox.ini
index 88b59ba..2e876bf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion=2.3.1
-envlist = py27,py33,py34,py35,flake8,linters,docs
+envlist = py27,py33,py34,py35,py36,flake8,linters,docs
 
 [testenv]
 deps =
@@ -17,7 +17,7 @@ deps =
     .
 commands = {posargs}
 
-# Dogfood our current mastera version
+# Dogfood our current master version
 [testenv:dogfood]
 basepython = python3
 skip_install = true