diff --git a/constraints.txt b/constraints.txt
index 42c8b145..65926fcd 100644
--- a/constraints.txt
+++ b/constraints.txt
@@ -5,3 +5,4 @@ flake8==5.0.2
 objgraph==3.5.0
 pytest==6.2.5
 pytest-cov==3.0.0
+pytest-timeout==2.2.0
diff --git a/pyproject.toml b/pyproject.toml
index f474736c..f9299cd6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -20,11 +20,13 @@ extend-exclude = '''
 '''
 
 [tool.pytest.ini_options]
-addopts = "-ra -v"
+addopts = "-ra -v --color=yes"
 log_cli = true
 log_cli_date_format = "%Y-%m-%d %H:%M:%S"
 log_cli_format = "%(asctime)s %(levelname)s %(message)s"
 log_cli_level = "INFO"
+# Per-test timeout in seconds
+timeout = 600
 
 [tool.mypy]