diff --git a/tox.ini b/tox.ini
index accc383..ef9f0e1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,9 @@
 [tox]
 envlist =
-       {py27,py33,py34,py35}-django18-restframework{33,34},
-       {py27,py34,py35}-django{19,110}-restframework34,
-       {py27,py34,py35}-django-latest-restframework34
+       {py27,py33,py34,py35}-django18-restframework{34,35},
+       {py27,py34,py35}-django{19,110}-restframework{34,35},
+       {py27,py34,py35}-djangolatest-restframeworklatest,
+       warnings
 
 
 [testenv]
@@ -13,16 +14,25 @@ deps =
     django18: django>=1.8.0,<1.9.0
     django19: django>=1.9.0,<1.10.0
     django110: django>=1.10.0,<1.11.0
-    django-latest: https://github.com/django/django/archive/master.tar.gz
-    restframework33: djangorestframework>=3.3,<3.4
+    djangolatest: https://github.com/django/django/archive/master.tar.gz
     restframework34: djangorestframework>=3.4,<3.5
+    restframework35: djangorestframework>=3.5,<3.6
+    restframeworklatest: https://github.com/tomchristie/django-rest-framework/archive/master.tar.gz
     -rrequirements/test-ci.txt
 
-[testenv:py27-django-latest-restframework34]
+[testenv:py27-djangolatest-restframeworklatest]
 ignore_outcome = True
 
-[testenv:py34-django-latest-restframework34]
+[testenv:py34-djangolatest-restframeworklatest]
 ignore_outcome = True
 
-[testenv:py35-django-latest-restframework34]
+[testenv:py35-djangolatest-restframeworklatest]
 ignore_outcome = True
+
+[testenv:warnings]
+ignore_outcome = True
+commands = python -Werror ./runtests.py {posargs}
+deps =
+    https://github.com/django/django/archive/master.tar.gz
+    https://github.com/tomchristie/django-rest-framework/archive/master.tar.gz
+    -rrequirements/test-ci.txt