diff --git a/setup.cfg b/setup.cfg
index 0294a71..97bd267 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -21,6 +21,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 6a05eb8..637fc9f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 1.6
 skipsdist = True
-envlist = py34, pep8, py27, pypy
+envlist = py{34,27,35}, pep8, pypy
 
 [testenv]
 setenv VIRTUAL_ENV={envdir}