3 files changed, 4 insertions, 2 deletions

diff --git a/.travis.yml b/.travis.yml
index 0899d80..423c5ca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ python:
   - 3.2
   - 3.3
   - 3.4
+  - 3.5
   - pypy
 services:
   - memcached
diff --git a/setup.py b/setup.py
index c1dd198..92c6e0f 100644
--- a/setup.py
+++ b/setup.py
@@ -31,5 +31,6 @@ setup(name="python-memcached",
           "Programming Language :: Python :: 3",
           "Programming Language :: Python :: 3.2",
           "Programming Language :: Python :: 3.3",
-          "Programming Language :: Python :: 3.4"
+          "Programming Language :: Python :: 3.4",
+          "Programming Language :: Python :: 3.5",
           ])
diff --git a/tox.ini b/tox.ini
index 444c527..d431974 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = py26,py27,py32,py33,py34,pypy,pep8
+envlist = py26,py27,py32,py33,py34,py35,pypy,pep8
 skipsdist = True
 
 [testenv]