diff --git a/setup.cfg b/setup.cfg
index 4e78ecdda6..f35bd22184 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -18,6 +18,7 @@ classifier =
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.4
+    Programming Language :: Python :: 3.5
 
 [files]
 packages =
diff --git a/tox.ini b/tox.ini
index 838583f082..e2fc9ac287 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 1.6
 skipsdist = True
-envlist = py34,py27,pep8
+envlist = py35,py34,py27,pep8
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
@@ -32,6 +32,10 @@ distribute = false
 basepython = python3.4
 
 
+[testenv:py35]
+basepython = python3.5
+
+
 [testenv:venv]
 commands = {posargs}
 
@@ -42,6 +46,10 @@ commands = oslo_debug_helper -t tests {posargs}
 basepython = python3.4
 commands = oslo_debug_helper -t tests {posargs}
 
+[testenv:debug35]
+basepython = python3.5
+commands = oslo_debug_helper -t tests {posargs}
+
 [testenv:cli]
 sitepackages = True
 commands =