diff --git a/setup.cfg b/setup.cfg
index a02d10d64..74f682c50 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -11,6 +11,7 @@ classifiers =
     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 ae8347592..04ff811eb 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