diff --git a/.travis.yml b/.travis.yml
index 4c2bfcd..0e2fe37 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,108 +2,14 @@ language: python
 
 sudo: false
 
-env:
-    - TOX_ENV=py27-flake8
-    - TOX_ENV=py27-docs
-    - TOX_ENV=py27-django1.6-drf2.4
-    - TOX_ENV=py27-django1.6-drf3.0
-    - TOX_ENV=py27-django1.6-drf3.1
-    - TOX_ENV=py27-django1.6-drf3.2
-    - TOX_ENV=py27-django1.7-drf2.4
-    - TOX_ENV=py27-django1.7-drf3.0
-    - TOX_ENV=py27-django1.7-drf3.1
-    - TOX_ENV=py27-django1.7-drf3.2
-    - TOX_ENV=py27-django1.7-drf3.3
-    - TOX_ENV=py27-django1.8-drf2.4
-    - TOX_ENV=py27-django1.8-drf3.0
-    - TOX_ENV=py27-django1.8-drf3.1
-    - TOX_ENV=py27-django1.8-drf3.2
-    - TOX_ENV=py27-django1.8-drf3.3
-    - TOX_ENV=py27-django1.8-drf3.4
-    - TOX_ENV=py27-django1.8-drf3.5
-    - TOX_ENV=py27-django1.8-drf3.6
-    - TOX_ENV=py27-django1.9-drf3.3
-    - TOX_ENV=py27-django1.9-drf3.4
-    - TOX_ENV=py27-django1.9-drf3.5
-    - TOX_ENV=py27-django1.9-drf3.6
-    - TOX_ENV=py27-django1.10-drf3.4
-    - TOX_ENV=py27-django1.10-drf3.5
-    - TOX_ENV=py27-django1.10-drf3.6
-    - TOX_ENV=py27-django1.10-drf3.7
-    - TOX_ENV=py27-django1.10-drf3.8
-    - TOX_ENV=py27-django1.11-drf3.5
-    - TOX_ENV=py27-django1.11-drf3.6
-    - TOX_ENV=py27-django1.11-drf3.7
-    - TOX_ENV=py27-django1.11-drf3.8
-    - TOX_ENV=py33-django1.6-drf2.4
-    - TOX_ENV=py33-django1.6-drf3.0
-    - TOX_ENV=py33-django1.6-drf3.1
-    - TOX_ENV=py33-django1.6-drf3.2
-    - TOX_ENV=py33-django1.7-drf2.4
-    - TOX_ENV=py33-django1.7-drf3.0
-    - TOX_ENV=py33-django1.7-drf3.1
-    - TOX_ENV=py33-django1.7-drf3.2
-    - TOX_ENV=py33-django1.7-drf3.3
-    - TOX_ENV=py33-django1.8-drf2.4
-    - TOX_ENV=py33-django1.8-drf3.0
-    - TOX_ENV=py33-django1.8-drf3.1
-    - TOX_ENV=py33-django1.8-drf3.2
-    - TOX_ENV=py33-django1.8-drf3.3
-    - TOX_ENV=py33-django1.8-drf3.4
-    - TOX_ENV=py33-django1.8-drf3.5
-    - TOX_ENV=py33-django1.8-drf3.6
-    - TOX_ENV=py33-django1.9-drf3.3
-    - TOX_ENV=py33-django1.9-drf3.4
-    - TOX_ENV=py33-django1.9-drf3.5
-    - TOX_ENV=py33-django1.9-drf3.6
-    - TOX_ENV=py33-django1.10-drf3.4
-    - TOX_ENV=py33-django1.10-drf3.5
-    - TOX_ENV=py33-django1.10-drf3.6
-    - TOX_ENV=py33-django1.10-drf3.7
-    - TOX_ENV=py33-django1.10-drf3.8
-    - TOX_ENV=py33-django1.11-drf3.5
-    - TOX_ENV=py33-django1.11-drf3.6
-    - TOX_ENV=py33-django1.11-drf3.7
-    - TOX_ENV=py33-django1.11-drf3.8
-    - TOX_ENV=py34-django1.6-drf2.4
-    - TOX_ENV=py34-django1.6-drf3.0
-    - TOX_ENV=py34-django1.6-drf3.1
-    - TOX_ENV=py34-django1.6-drf3.2
-    - TOX_ENV=py34-django1.7-drf2.4
-    - TOX_ENV=py34-django1.7-drf3.0
-    - TOX_ENV=py34-django1.7-drf3.1
-    - TOX_ENV=py34-django1.7-drf3.2
-    - TOX_ENV=py34-django1.7-drf3.3
-    - TOX_ENV=py34-django1.8-drf2.4
-    - TOX_ENV=py34-django1.8-drf3.0
-    - TOX_ENV=py34-django1.8-drf3.1
-    - TOX_ENV=py34-django1.8-drf3.2
-    - TOX_ENV=py34-django1.8-drf3.3
-    - TOX_ENV=py34-django1.8-drf3.4
-    - TOX_ENV=py34-django1.8-drf3.5
-    - TOX_ENV=py34-django1.8-drf3.6
-    - TOX_ENV=py34-django1.9-drf3.3
-    - TOX_ENV=py34-django1.9-drf3.4
-    - TOX_ENV=py34-django1.9-drf3.5
-    - TOX_ENV=py34-django1.9-drf3.6
-    - TOX_ENV=py34-django1.10-drf3.4
-    - TOX_ENV=py34-django1.10-drf3.5
-    - TOX_ENV=py34-django1.10-drf3.6
-    - TOX_ENV=py34-django1.10-drf3.7
-    - TOX_ENV=py34-django1.10-drf3.8
-    - TOX_ENV=py34-django1.11-drf3.5
-    - TOX_ENV=py34-django1.11-drf3.6
-    - TOX_ENV=py34-django1.11-drf3.7
-    - TOX_ENV=py34-django1.11-drf3.8
-    - TOX_ENV=py34-django2.0-drf3.7
-    - TOX_ENV=py34-django2.0-drf3.8
-
-
-matrix:
-  fast_finish: true
+python:
+  - "2.7"
+  - "3.4"
+  - "3.5"
+  - "3.6"
 
 install:
-  - pip install tox
+  - pip install tox tox-travis
 
 script:
-    - tox -e $TOX_ENV
+    - tox
diff --git a/README.md b/README.md
index 4bc5ddb..5819ff7 100644
--- a/README.md
+++ b/README.md
@@ -15,9 +15,9 @@ XML support extracted as a third party package directly from the official Django
 
 ## Requirements
 
-* Python (2.7, 3.3, 3.4)
-* Django (1.6 - 1.11, 2.0)
-* Django REST Framework (2.4, 3.0 - 3.8)
+* Python (2.7, 3.4, 3.5, 3.6)
+* Django (1.8 - 1.11, 2.0 - 2.1)
+* Django REST Framework (2.4, 3.0 - 3.9)
 
 This project is tested on the combinations of Python and Django that are supported by each version of Django REST Framework.
 
diff --git a/setup.py b/setup.py
index 5512793..8c861b1 100644
--- a/setup.py
+++ b/setup.py
@@ -100,8 +100,9 @@ def get_package_data(package):
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Internet :: WWW/HTTP',
     ]
 )
diff --git a/tox.ini b/tox.ini
index f98e578..0723de7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,26 +1,28 @@
 [tox]
 envlist =
        py27-{flake8,docs},
-       {py27,py33,py34}-django1.6-drf{2.4,3.0,3.1,3.2}
-       {py27,py33,py34}-django1.7-drf{2.4,3.0,3.1,3.2,3.3}
-       {py27,py33,py34}-django1.8-drf{2.4,3.0,3.1,3.2,3.3,3.4,3.5,3.6}
-       {py27,py33,py34}-django1.9-drf{3.3,3.4,3.5,3.6}
-       {py27,py33,py34}-django1.10-drf{3.4,3.5,3.6,3.7,3.8}
-       {py27,py33,py34}-django1.11-drf{3.5,3.6,3.7,3.8}
-       {py34}-django2.0-drf{3.7,3.8}
+       {py27,py34}-django1.8-drf{2.4,3.0,3.1,3.2,3.3,3.4,3.5,3.6}
+       {py35}-django1.8-drf{3.5,3.6}
+       {py27,py34}-django1.9-drf{3.3,3.4,3.5,3.6}
+       {py35}-django1.9-drf{3.5,3.6}
+       {py27,py34}-django1.10-drf{3.4,3.5,3.6,3.7,3.8}
+       {py35}-django1.10-drf{3.5,3.6,3.7,3.8}
+       {py27,py34,py35}-django1.11-drf{3.5,3.6,3.7,3.8,3.9}
+       {py36}-django1.11-drf{3.7,3.8,3.9}
+       {py34,py35,py36}-django2.0-drf{3.7,3.8,3.9}
+       {py35,py36}-django2.1-drf{3.8,3.9}
 
 [testenv]
 commands = ./runtests.py --fast
 setenv =
        PYTHONDONTWRITEBYTECODE=1
 deps =
-       django1.6: Django==1.6.*
-       django1.7: Django==1.7.*
        django1.8: Django==1.8.*
        django1.9: Django==1.9.*
        django1.10: Django==1.10.*
        django1.11: Django==1.11.*
        django2.0: Django==2.0.*
+       django2.1: Django==2.1.*
        drf2.4: djangorestframework==2.4.*
        drf3.0: djangorestframework==3.0.*
        drf3.1: djangorestframework==3.1.*
@@ -31,7 +33,8 @@ deps =
        drf3.6: djangorestframework==3.6.*
        drf3.7: djangorestframework==3.7.*
        drf3.8: djangorestframework==3.8.*
-       pytest-django==2.8.0
+       drf3.9: djangorestframework==3.9.*
+       pytest-django==3.4.*
 
 [testenv:py27-flake8]
 commands = ./runtests.py --lintonly