diff --git a/pytest.ini b/pytest.ini
index 3aa5f82..6104bb7 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,5 +1,5 @@
 [pytest]
-addopts = -m "not live and not docker"
+addopts = -m "not live and not docker" --timeout=60 --strict-markers
 markers =
     live: tests requiring server access (run with '-m live')
     docker: tests requiring Docker (run with '-m docker')
diff --git a/requirements.txt b/requirements.txt
index bbf3e98..97994cc 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -40,3 +40,6 @@ numpy>=1.24.0
 
 # Sample data generation
 faker>=24.0.0
+
+# Testing
+pytest-timeout>=2.0.0