diff --git a/setup.cfg b/setup.cfg
index 9138fc221..c7416a127 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 402ae8318..fca204a79 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py34,py27,pep8,docs
+envlist = py35,py34,py27,pep8,docs
 minversion = 1.6
 skipsdist = True