diff --git a/certbot-ci/setup.py b/certbot-ci/setup.py
index 728c6c707..f0b89780e 100644
--- a/certbot-ci/setup.py
+++ b/certbot-ci/setup.py
@@ -18,6 +18,7 @@ install_requires = [
     'pyopenssl',
     'pytest',
     'pytest-cov',
+    'pytest-timeout',
     # This version is needed for "worker" attributes we currently use like
     # "workerinput".  See https://github.com/pytest-dev/pytest-xdist/pull/268.
     'pytest-xdist>=1.22.1',
diff --git a/tox.ini b/tox.ini
index 0670b7ee2..bf57afc49 100644
--- a/tox.ini
+++ b/tox.ini
@@ -41,6 +41,7 @@ commands =
 # https://github.com/certbot/certbot/issues/7745.
 recreate = true
 setenv =
+    PYTEST_ADDOPTS = {env:PYTEST_ADDOPTS:--timeout=300}
     PYTHONHASHSEED = 0
 
 [testenv:oldest]