diff --git a/setup.cfg b/setup.cfg
index 0398f5e5..7bc9d7fa 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,6 +19,8 @@ classifier =
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
 
 [files]
 packages =
diff --git a/tox.ini b/tox.ini
index bfd45c66..a3d161d6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist = py35,py27,pep8
-minversion = 1.6
+minversion = 2.0
 skipsdist = True
 
 [testenv]