1 files changed, 43 insertions, 24 deletions
diff --git a/tox.ini b/tox.ini
index e2121005..19192308 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,21 @@
 [tox]
 downloadcache = {toxworkdir}/cache/
-envlist = py3.3-django1.7,py3.2-django1.7,py2.7-django1.7,py3.3-django1.6,py3.2-django1.6,py2.7-django1.6,py2.6-django1.6,py3.3-django1.5,py3.2-django1.5,py2.7-django1.5,py2.6-django1.5,py2.7-django1.4,py2.6-django1.4,py2.7-django1.3,py2.6-django1.3
+envlist =
+       py3.4-django1.7,py3.3-django1.7,py3.2-django1.7,py2.7-django1.7,
+       py3.4-django1.6,py3.3-django1.6,py3.2-django1.6,py2.7-django1.6,py2.6-django1.6,
+       py3.4-django1.5,py3.3-django1.5,py3.2-django1.5,py2.7-django1.5,py2.6-django1.5,
+       py2.7-django1.4,py2.6-django1.4,
 
 [testenv]
-commands = {envpython} rest_framework/runtests/runtests.py
+commands = py.test -q
+
+[testenv:py3.4-django1.7]
+basepython = python3.4
+deps = https://www.djangoproject.com/download/1.7b2/tarball/
+       django-filter==0.7
+       defusedxml==0.3
+       Pillow==2.3.0
+       pytest-django==2.6.1
 
 [testenv:py3.3-django1.7]
 basepython = python3.3
@@ -11,6 +23,7 @@ deps = https://www.djangoproject.com/download/1.7b2/tarball/
        django-filter==0.7
        defusedxml==0.3
        Pillow==2.3.0
+       pytest-django==2.6.1
 
 [testenv:py3.2-django1.7]
 basepython = python3.2
@@ -18,6 +31,7 @@ deps = https://www.djangoproject.com/download/1.7b2/tarball/
        django-filter==0.7
        defusedxml==0.3
        Pillow==2.3.0
+       pytest-django==2.6.1
 
 [testenv:py2.7-django1.7]
 basepython = python2.7
@@ -29,6 +43,15 @@ deps = https://www.djangoproject.com/download/1.7b2/tarball/
        django-oauth2-provider==0.2.4
        django-guardian==1.1.1
        Pillow==2.3.0
+       pytest-django==2.6.1
+
+[testenv:py3.4-django1.6]
+basepython = python3.4
+deps = Django==1.6.3
+       django-filter==0.7
+       defusedxml==0.3
+       Pillow==2.3.0
+       pytest-django==2.6.1
 
 [testenv:py3.3-django1.6]
 basepython = python3.3
@@ -36,6 +59,7 @@ deps = Django==1.6.3
        django-filter==0.7
        defusedxml==0.3
        Pillow==2.3.0
+       pytest-django==2.6.1
 
 [testenv:py3.2-django1.6]
 basepython = python3.2
@@ -43,6 +67,7 @@ deps = Django==1.6.3
        django-filter==0.7
        defusedxml==0.3
        Pillow==2.3.0
+       pytest-django==2.6.1
 
 [testenv:py2.7-django1.6]
 basepython = python2.7
@@ -54,6 +79,7 @@ deps = Django==1.6.3
        django-oauth2-provider==0.2.4
        django-guardian==1.1.1
        Pillow==2.3.0
+       pytest-django==2.6.1
 
 [testenv:py2.6-django1.6]
 basepython = python2.6
@@ -65,6 +91,15 @@ deps = Django==1.6.3
        django-oauth2-provider==0.2.4
        django-guardian==1.1.1
        Pillow==2.3.0
+       pytest-django==2.6.1
+
+[testenv:py3.4-django1.5]
+basepython = python3.4
+deps = django==1.5.6
+       django-filter==0.7
+       defusedxml==0.3
+       Pillow==2.3.0
+       pytest-django==2.6.1
 
 [testenv:py3.3-django1.5]
 basepython = python3.3
@@ -72,6 +107,7 @@ deps = django==1.5.6
        django-filter==0.7
        defusedxml==0.3
        Pillow==2.3.0
+       pytest-django==2.6.1
 
 [testenv:py3.2-django1.5]
 basepython = python3.2
@@ -79,6 +115,7 @@ deps = django==1.5.6
        django-filter==0.7
        defusedxml==0.3
        Pillow==2.3.0
+       pytest-django==2.6.1
 
 [testenv:py2.7-django1.5]
 basepython = python2.7
@@ -90,6 +127,7 @@ deps = django==1.5.6
        django-oauth2-provider==0.2.3
        django-guardian==1.1.1
        Pillow==2.3.0
+       pytest-django==2.6.1
 
 [testenv:py2.6-django1.5]
 basepython = python2.6
@@ -101,6 +139,7 @@ deps = django==1.5.6
        django-oauth2-provider==0.2.3
        django-guardian==1.1.1
        Pillow==2.3.0
+       pytest-django==2.6.1
 
 [testenv:py2.7-django1.4]
 basepython = python2.7
@@ -112,6 +151,7 @@ deps = django==1.4.11
        django-oauth2-provider==0.2.3
        django-guardian==1.1.1
        Pillow==2.3.0
+       pytest-django==2.6.1
 
 [testenv:py2.6-django1.4]
 basepython = python2.6
@@ -123,25 +163,4 @@ deps = django==1.4.11
        django-oauth2-provider==0.2.3
        django-guardian==1.1.1
        Pillow==2.3.0
-
-[testenv:py2.7-django1.3]
-basepython = python2.7
-deps = django==1.3.5
-       django-filter==0.5.4
-       defusedxml==0.3
-       django-oauth-plus==2.2.1
-       oauth2==1.5.211
-       django-oauth2-provider==0.2.3
-       django-guardian==1.1.1
-       Pillow==2.3.0
-
-[testenv:py2.6-django1.3]
-basepython = python2.6
-deps = django==1.3.5
-       django-filter==0.5.4
-       defusedxml==0.3
-       django-oauth-plus==2.2.1
-       oauth2==1.5.211
-       django-oauth2-provider==0.2.3
-       django-guardian==1.1.1
-       Pillow==2.3.0
+       pytest-django==2.6.1