diff --git a/tox.ini b/tox.ini
index 09241c1d8..b3f084a4d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@ envlist=flake8,py27,py34,py35,py36,pypy,du13,du12,du11
 [testenv]
 deps=
     six
-    nose
+    pytest
     sqlalchemy
     whoosh
     html5lib
@@ -15,7 +15,7 @@ setenv =
     SPHINX_TEST_TEMPDIR = {envdir}/testbuild
     PYTHONDONTWRITEBYTECODE = true
 commands=
-    {envpython} -Wall tests/run.py --ignore-files=test_autodoc_py35 -m '^[tT]est' {posargs}
+    {envpython} -Wall tests/run.py --ignore tests/py35 {posargs}
     sphinx-build -q -W -b html -d {envtmpdir}/doctrees doc {envtmpdir}/html
 
 [testenv:pypy]
@@ -48,5 +48,5 @@ deps=
 
 [testenv:py35]
 commands=
-    {envpython} -Wall tests/run.py -m '^[tT]est' {posargs}
+    {envpython} -Wall tests/run.py {posargs}
     sphinx-build -q -W -b html -d {envtmpdir}/doctrees doc {envtmpdir}/html