diff --git a/.appveyor.yml b/.appveyor.yml
index a3f83394f..d2c5d0d95 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -39,7 +39,7 @@ test_script:
       if (-not $test_ignore) { $test_ignore = '' }
       $tests = $env:TEST
       if (-not $tests) { $tests = '' }
-      & "C:\Python$($env:PYTHON)\python.exe" run.py $test_ignore.Split(' ') --junitxml .junit.xml $tests.Split(' ')
+      & "C:\Python$($env:PYTHON)\python.exe" -m pytest $test_ignore.Split(' ') --junitxml .junit.xml $tests.Split(' ')
       Pop-Location
       if ($LastExitCode -eq 1) { Write-Host "Test Failures Occurred, leaving for test result parsing" }
       elseif ($LastExitCode -ne 0) { Write-Host "Other Error Occurred, aborting"; exit $LastExitCode }
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index c4b8569b0..03d26c001 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -317,14 +317,17 @@ There are a couple reasons that code in Sphinx might be deprecated:
   no longer needs to support the older version of Python that doesn't include
   the library, the library will be deprecated in Sphinx.
 
-As the :ref:`deprecation-policy` describes,
-the first release of Sphinx that deprecates a feature (``A.B``) should raise a
-``RemovedInSphinxXXWarning`` (where XX is the Sphinx version where the feature
-will be removed) when the deprecated feature is invoked. Assuming we have good
-test coverage, these warnings are converted to errors when running the test
-suite with warnings enabled: ``python -Wall tests/run.py``. Thus, when adding
-a ``RemovedInSphinxXXWarning`` you need to eliminate or silence any warnings
-generated when running the tests.
+As the :ref:`deprecation-policy` describes, the first release of Sphinx that
+deprecates a feature (``A.B``) should raise a ``RemovedInSphinxXXWarning``
+(where ``XX`` is the Sphinx version where the feature will be removed) when the
+deprecated feature is invoked. Assuming we have good test coverage, these
+warnings are converted to errors when running the test suite with warnings
+enabled::
+
+    pytest -Wall
+
+Thus, when adding a ``RemovedInSphinxXXWarning`` you need to eliminate or
+silence any warnings generated when running the tests.
 
 .. _deprecation-policy:
 
diff --git a/Makefile b/Makefile
index e4abba088..67699363f 100644
--- a/Makefile
+++ b/Makefile
@@ -69,7 +69,7 @@ reindent:
 
 .PHONY: test
 test:
-	@cd tests; $(PYTHON) run.py -v $(TEST)
+	@$(PYTHON) -m pytest -v $(TEST)
 
 .PHONY: test-async
 test-async:
@@ -77,7 +77,7 @@ test-async:
 
 .PHONY: covertest
 covertest:
-	@cd tests; $(PYTHON) run.py -v --cov=sphinx --junitxml=.junit.xml $(TEST)
+	@$(PYTHON) -m pytest -v --cov=sphinx --junitxml=.junit.xml $(TEST)
 
 .PHONY: build
 build:
diff --git a/tests/run.py b/tests/run.py
deleted file mode 100755
index 6c82db782..000000000
--- a/tests/run.py
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-"""
-    Sphinx unit test driver
-    ~~~~~~~~~~~~~~~~~~~~~~~
-
-    This script runs the Sphinx unit test suite.
-
-    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
-    :license: BSD, see LICENSE for details.
-"""
-import sys
-
-import pytest
-
-sys.exit(pytest.main(sys.argv[1:]))
diff --git a/tests/test_pycode.py b/tests/test_pycode.py
index 2b5ae1514..400c47dc5 100644
--- a/tests/test_pycode.py
+++ b/tests/test_pycode.py
@@ -41,7 +41,8 @@ def test_ModuleAnalyzer_for_file():
 def test_ModuleAnalyzer_for_module():
     analyzer = ModuleAnalyzer.for_module('sphinx')
     assert analyzer.modname == 'sphinx'
-    assert analyzer.srcname == SPHINX_MODULE_PATH
+    assert analyzer.srcname in (SPHINX_MODULE_PATH,
+                                os.path.abspath(SPHINX_MODULE_PATH))
     assert analyzer.encoding == 'utf-8'
 
 
diff --git a/tox.ini b/tox.ini
index 36fdf83f4..0d19225f8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -22,7 +22,7 @@ deps =
 setenv =
     SPHINX_TEST_TEMPDIR = {envdir}/testbuild
 commands=
-    {envpython} -Wall tests/run.py --durations 25 {posargs}
+    pytest -Wall --durations 25 {posargs}
 
 [testenv:flake8]
 description =