diff --git a/integration/test_web.py b/integration/test_web.py
index fe2137ff3..a16bf2e71 100644
--- a/integration/test_web.py
+++ b/integration/test_web.py
@@ -21,6 +21,8 @@ import requests
 import html5lib
 from bs4 import BeautifulSoup
 
+import pytest
+
 
 def test_index(alice):
     """
@@ -175,6 +177,7 @@ def test_deep_stats(alice):
         time.sleep(.5)
 
 
+@pytest.mark.timeout(60)
 def test_status(alice):
     """
     confirm we get something sensible from /status and the various sub-types
diff --git a/setup.py b/setup.py
index 952a921bc..5dc68d367 100644
--- a/setup.py
+++ b/setup.py
@@ -396,6 +396,7 @@ setup(name="tahoe-lafs", # also set in __init__.py
               "junitxml",
               "tenacity",
               "paramiko",
+              "pytest-timeout",
           ] + tor_requires + i2p_requires,
           "tor": tor_requires,
           "i2p": i2p_requires,