diff --git a/tests/hitl/conftest.py b/tests/hitl/conftest.py
index 9bfe75a6..148d3730 100644
--- a/tests/hitl/conftest.py
+++ b/tests/hitl/conftest.py
@@ -92,8 +92,8 @@ def pytest_collection_modifyitems(items):
     if item.get_closest_marker('execution_timeout') is None:
       item.add_marker(pytest.mark.execution_timeout(10))
 
-    item.add_marker(pytest.mark.setup_timeout(18))
-    item.add_marker(pytest.mark.teardown_timeout(12))
+    item.add_marker(pytest.mark.setup_timeout(20))
+    item.add_marker(pytest.mark.teardown_timeout(20))
 
 
 def pytest_make_parametrize_id(config, val, argname):