diff --git a/.travis.yml b/.travis.yml
index cba3063..f4b9c89 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,18 +18,19 @@ env:
   - TOXENV=py32-django16
   - TOXENV=py32-django17
   - TOXENV=py32-django18
-  - TOXENV=py32-django19
   - TOXENV=py32-django_trunk
   - TOXENV=py33-django15
   - TOXENV=py33-django16
   - TOXENV=py33-django17
   - TOXENV=py33-django18
-  - TOXENV=py33-django19
   - TOXENV=py33-django_trunk
   - TOXENV=py34-django17
   - TOXENV=py34-django18
   - TOXENV=py34-django19
   - TOXENV=py34-django_trunk
+  - TOXENV=py35-django18
+  - TOXENV=py35-django19
+  - TOXENV=py35-django_trunk
 
 install:
   - pip install --upgrade pip setuptools tox virtualenv coveralls
diff --git a/setup.py b/setup.py
index feb5ffc..5137408 100644
--- a/setup.py
+++ b/setup.py
@@ -36,6 +36,7 @@ setup(
         'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
         'Framework :: Django',
     ],
     zip_safe=False,
diff --git a/tox.ini b/tox.ini
index 0c4e8b5..ae7287f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,8 +2,9 @@
 envlist =
     py26-django{14,15,16},
     py27-django14, py27-django15_nosouth,
-    py{27,32,33}-django{15,16,17,18,19,_trunk},
+    py{27,32,33}-django{15,16,17,18,_trunk},
     py34-django{17,18,19,_trunk},
+    py35-django{18,19,_trunk},
 
 [testenv]
 basepython =
@@ -12,6 +13,7 @@ basepython =
     py32: python3.2
     py33: python3.3
     py34: python3.4
+    py35: python3.5
 
 deps =
     coverage == 3.6