diff --git a/.travis.yml b/.travis.yml
index f5c4e7f..abe0567 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,7 @@ python:
   - "2.7"
   - "3.3"
   - "3.4"
+  - "3.5"
 before_install:
   - pip install -U pip>=8.0.2
   - make test-env
diff --git a/setup.py b/setup.py
index 4e5b0b4..815cff7 100644
--- a/setup.py
+++ b/setup.py
@@ -47,6 +47,7 @@ setup(
         '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 611afa9..65190a1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py26, py27, py32, py33, py34
+envlist = py26, py27, py32, py33, py34, py35
 
 [testenv]
 commands =
@@ -12,4 +12,4 @@ commands =
 deps =
     pip>=8.0.2
     pytest
-    pytest-cov
\ No newline at end of file
+    pytest-cov