diff --git a/setup.py b/setup.py
index 65426e0ed..8c48e18d2 100644
--- a/setup.py
+++ b/setup.py
@@ -169,11 +169,9 @@ if "--reporter=bwverbose-coverage" in sys.argv:
 if "sdist_dsc" in sys.argv:
     setup_requires.append('stdeb >= 0.3')
 
-tests_require=[
-    # Mock - Mocking and Testing Library
-    # http://www.voidspace.org.uk/python/mock/
-    "mock",
-    ]
+# We no longer have any requirements specific to tests.
+tests_require=[]
+
 
 class ShowSupportLib(Command):
     user_options = []
diff --git a/src/allmydata/_auto_deps.py b/src/allmydata/_auto_deps.py
index ba450f9b6..9e9ff69ae 100644
--- a/src/allmydata/_auto_deps.py
+++ b/src/allmydata/_auto_deps.py
@@ -30,6 +30,9 @@ install_requires=[
                   "pycrypto == 2.0.1, == 2.1, >= 2.3",
                   "pyasn1 >= 0.0.8a",
 
+                  # http://www.voidspace.org.uk/python/mock/
+                  "mock",
+
                   # Will be needed to test web apps, but not yet. See #1001.
                   #"windmill >= 1.3",
                   ]