1 files changed, 5 insertions, 2 deletions
diff --git a/setup.py b/setup.py
index d02b7875..021e7fee 100755
--- a/setup.py
+++ b/setup.py
@@ -75,7 +75,10 @@ if sys.platform == 'win32' or force_windows_specific_files:
     package_data.setdefault('setuptools', []).extend(['*.exe'])
     package_data.setdefault('setuptools.command', []).extend(['*.xml'])
 
-pytest_runner = ['pytest-runner'] if 'ptr' in sys.argv else []
+needs_pytest = set(['ptr', 'pytest', 'test']).intersection(sys.argv)
+pytest_runner = ['pytest-runner'] if needs_pytest else []
+needs_sphinx = set(['build_sphinx', 'upload_docs']).intersection(sys.argv)
+sphinx = ['sphinx', 'rst.linker'] if needs_sphinx else []
 
 setup_params = dict(
     name="setuptools",
@@ -173,7 +176,7 @@ setup_params = dict(
         'pytest',
     ] + (['mock'] if sys.version_info[:2] < (3, 3) else []),
     setup_requires=[
-    ] + pytest_runner,
+    ] + sphinx + pytest_runner,
 )
 
 if __name__ == '__main__':