diff --git a/setup.cfg b/setup.cfg
index b429c608..30806070 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -15,6 +15,7 @@ classifier =
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
 
 [files]
 packages =
diff --git a/tox.ini b/tox.ini
index 5bb6fe1f..580a4a03 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 2.3.1
 skipsdist = True
-envlist = py{35,27},py{35,27}-{postgresql},functional,cover,pep8,bandit,docs
+envlist = py{36,35,27},py{36,35,27}-{postgresql},functional,cover,pep8,bandit,docs
 
 [testenv]
 usedevelop = True