diff --git a/setup.cfg b/setup.cfg
index 17cd4f4..cb37399 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -15,6 +15,7 @@ classifier =
     Programming Language :: Python :: 2
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
 
 [entry_points]
diff --git a/tox.ini b/tox.ini
index 4c6aecd..7ef2876 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 3.1.1
 skipsdist = True
-envlist = py27,py37,pep8
+envlist = py27,py36,py37,pep8
 # Automatic envs (pyXX) will use the python version appropriate to that
 # env and ignore basepython inherited from [testenv]. That's what we
 # want, and we don't need to be warned about it.