diff --git a/.travis.yml b/.travis.yml
index 8dfa4e2..cf23e34 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,12 @@ env:
   - TOXENV=py32-1.8.X
   - TOXENV=py33-1.8.X
   - TOXENV=py34-1.8.X
+# https://github.com/travis-ci/travis-ci/issues/4794
+matrix:
+  include:
+    - python: 3.5
+      env:
+        - TOXENV=py35-1.8.X
 notifications:
   irc: "irc.freenode.org#django-compressor"
 
diff --git a/tox.ini b/tox.ini
index 8767697..295c416 100644
--- a/tox.ini
+++ b/tox.ini
@@ -65,7 +65,7 @@ three_two =
 envlist =
     {py26,py27}-1.4.X,
     {py27,py32,py33,py34}-{1.7.X},
-    {py27,py32,py33,py34}-{1.8.X}
+    {py27,py32,py33,py34,py35}-{1.8.X}
 [testenv]
 basepython =
     py26: python2.6
@@ -73,6 +73,7 @@ basepython =
     py32: python3.2
     py33: python3.3
     py34: python3.4
+    py35: python3.5
 usedevelop = true
 setenv =
     CPPFLAGS=-O0
@@ -90,4 +91,5 @@ deps =
     py32: {[deps]three_two}
     py33: {[deps]three}
     py34: {[deps]three}
+    py35: {[deps]three}
     django-discover-runner