diff --git a/setup.cfg b/setup.cfg
index da5a954ad..cb5a853b5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,6 +16,7 @@ classifier =
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.4
+    Programming Language :: Python :: 3.5
 
 [files]
 packages = ironicclient
diff --git a/tox.ini b/tox.ini
index 43a17a095..1d3a0ecd4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = py34,py27,pep8,pypy
+envlist = py35,py34,py27,pep8,pypy
 skipsdist = True
 
 [testenv]