diff --git a/setup.cfg b/setup.cfg
index ab82b55..8ad7e84 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -13,6 +13,7 @@ classifier =
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
     Development Status :: 5 - Production/Stable
     Natural Language :: English
     Environment :: OpenStack
diff --git a/tox.ini b/tox.ini
index 1b93e71..fda40d4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.0
-envlist = py27,py36,pep8,pylint,docs
+envlist = py27,py36,py37,pep8,pylint,docs
 skipsdist = True
 
 [testenv]
@@ -40,12 +40,12 @@ commands = {posargs}
 [testenv:py27]
 basepython = python2.7
 
-[testenv:py35]
-basepython = python3.5
-
 [testenv:py36]
 basepython = python3.6
 
+[testenv:py37]
+basepython = python3.7
+
 [testenv:docs]
 basepython = python3
 deps = -r{toxinidir}/doc/requirements.txt