diff --git a/pytest.ini b/pytest.ini
index 83e03ee..961002a 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -12,6 +12,11 @@ testpaths = tests
 # Async test support
 asyncio_mode = auto
 
+# Per-test timeout — prevents blocking I/O or infinite loops from hanging CI.
+# Tests that legitimately need longer can use @pytest.mark.timeout(N).
+timeout = 30
+timeout_method = thread
+
 # Coverage configuration (optional)
 # [tool:pytest]
 # addopts = --cov=modules --cov-report=html --cov-report=term-missing