diff --git a/TODO.txt b/TODO.txt
index f57a8b23..afdcd1b2 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -5,8 +5,6 @@
 - Anticipate multivalue and single-value-only headers in request headers in
   parser.py.
 
-- Timeout functests.
-
 - Complex pipelining functests (with intermediate connection: close).
 
 - Killthreads support.
diff --git a/setup.cfg b/setup.cfg
index 415c8d70..48de8999 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -52,6 +52,7 @@ where=src
 [options.extras_require]
 testing =
     pytest
+    pytest-timeout
     pytest-cov
     coverage>=5.0
 
@@ -61,6 +62,7 @@ docs =
     pylons-sphinx-themes>=1.0.9
 
 [tool:pytest]
+timeout = 30
 python_files = test_*.py
 # For the benefit of test_wasyncore.py
 python_classes = Test*