diff --git a/setup.cfg b/setup.cfg
index f903e7b5..e2e070f8 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,6 +19,7 @@ classifier =
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.4
+    Programming Language :: Python :: 3.5
     Topic :: Software Development :: Libraries
     Topic :: System :: Distributed Computing
 
diff --git a/tox.ini b/tox.ini
index abc05c57..d838abed 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,6 +5,7 @@ envlist = cover,
     pep8,
     py27,
     py34,
+    py35,
     pylint,
     update-states