diff --git a/setup.cfg b/setup.cfg
index a54502532..f6c4b4ba9 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -17,6 +17,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 cdea6df79..5b026cb3c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = py34,py27,pep8,functional
+envlist = py35,py34,py27,pep8,functional
 skipsdist = True
 
 [testenv]
@@ -53,6 +53,10 @@ commands = oslo_debug_helper {posargs}
 basepython = python3.4
 commands = oslo_debug_helper {posargs}
 
+[testenv:debug-py35]
+basepython = python3.5
+commands = oslo_debug_helper {posargs}
+
 [testenv:pep8]
 commands =
     flake8 senlin