diff --git a/setup.cfg b/setup.cfg
index 6cc0fc1..f0e9c0c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -7,6 +7,9 @@ classifiers =
     Programming Language :: Python
     Programming Language :: Python :: 2
     Programming Language :: Python :: 2.7
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.4
+    Programming Language :: Python :: 3.5
     Environment :: OpenStack
     Intended Audience :: Information Technology
     Intended Audience :: System Administrators
diff --git a/tox.ini b/tox.ini
index 5cfc064..dc55c7e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py34,py27,pep8
+envlist = py35,py34,py27,pep8
 minversion = 1.6
 skipsdist = True
 
@@ -26,6 +26,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 {posargs}