1 files changed, 16 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index e2121005..6212a6b2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,7 +3,7 @@ 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
 
 [testenv]
-commands = {envpython} rest_framework/runtests/runtests.py
+commands = py.test -q
 
 [testenv:py3.3-django1.7]
 basepython = python3.3
@@ -11,6 +11,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 +19,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 +31,7 @@ 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.3-django1.6]
 basepython = python3.3
@@ -36,6 +39,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 +47,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 +59,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 +71,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:py3.3-django1.5]
 basepython = python3.3
@@ -72,6 +79,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 +87,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 +99,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 +111,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 +123,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,6 +135,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.7-django1.3]
 basepython = python2.7
@@ -134,6 +147,7 @@ deps = django==1.3.5
        django-oauth2-provider==0.2.3
        django-guardian==1.1.1
        Pillow==2.3.0
+       pytest-django==2.6.1
 
 [testenv:py2.6-django1.3]
 basepython = python2.6
@@ -145,3 +159,4 @@ deps = django==1.3.5
        django-oauth2-provider==0.2.3
        django-guardian==1.1.1
        Pillow==2.3.0
+       pytest-django==2.6.1