diff --git a/setup.cfg b/setup.cfg
index f6c489eb9..c1182a26c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,6 +16,7 @@ classifier =
     Programming Language :: Python :: 2
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3.4
+    Programming Language :: Python :: 3.5
     Topic :: System :: Monitoring
 
 [global]
diff --git a/tox.ini b/tox.ini
index 51caec89d..f0981188d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.3.1
-envlist = py34,py27,pep8
+envlist = py35,py34,py27,pep8
 skipsdist = True
 
 [testenv]