diff --git a/setup.cfg b/setup.cfg
index bab794f33..fb1de40c5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -15,6 +15,8 @@ classifier =
     Programming Language :: Python
     Programming Language :: Python :: 2
     Programming Language :: Python :: 2.7
+    Programming Language :: Python :: 3.4
+    Programming Language :: Python :: 3.5
 
 [files]
 packages =
diff --git a/tox.ini b/tox.ini
index d5ea72226..444c70dff 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = py34,py27,pypy,pep8
+envlist = py35,py34,py27,pypy,pep8
 skipsdist = True
 
 [testenv]
@@ -86,4 +86,4 @@ import_exceptions = zaqar.openstack.common.gettextutils._,zaqar.i18n._
 # upstream infra does not yet support it. Once that's fixed, we can
 # drop the install_command.
 install_command = pip install -U --force-reinstall {opts} {packages}
-commands = sphinx-build -a -E -W -d install-guide/build/doctrees -b html install-guide/source install-guide/build/html
\ No newline at end of file
+commands = sphinx-build -a -E -W -d install-guide/build/doctrees -b html install-guide/source install-guide/build/html