diff --git a/setup.cfg b/setup.cfg
index cdfd7311..0e5244bd 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -15,7 +15,7 @@ classifier =
     Programming Language :: Python :: 2
     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 772086f6..a9c49953 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 3.1.1
-envlist = py35,py27,pep8
+envlist = py36,py27,pep8
 skipsdist = True
 # Automatic envs (pyXX) will use the python version appropriate to that
 # env and ignore basepython inherited from [testenv]. That's what we
@@ -41,6 +41,18 @@ commands =
   stestr run {posargs}
   stestr slowest
 
+[testenv:py36]
+commands =
+  {[testenv]commands}
+  stestr run {posargs}
+  stestr slowest
+
+[testenv:py37]
+commands =
+  {[testenv]commands}
+  stestr run {posargs}
+  stestr slowest
+
 [testenv:pep8]
 commands = flake8