diff --git a/buildscripts/tests/timeouts/test_timeout_service.py b/buildscripts/tests/timeouts/test_timeout_service.py
index a1a0c59cb1e..71b5ce4a41e 100644
--- a/buildscripts/tests/timeouts/test_timeout_service.py
+++ b/buildscripts/tests/timeouts/test_timeout_service.py
@@ -133,7 +133,7 @@ class TestGetTimeoutEstimate(unittest.TestCase):
 
         self.assertTrue(timeout.is_specified())
         self.assertEqual(None, timeout.calculate_test_timeout(1))
-        self.assertEqual(54180, timeout.calculate_task_timeout(1))
+        self.assertEqual(54360, timeout.calculate_task_timeout(1))
 
     @patch(ns("HistoricTaskData.from_s3"))
     def test_enough_history_but_some_tests_with_zero_runtime_should_cause_custom_task_and_default_test_timeout(
@@ -165,7 +165,7 @@ class TestGetTimeoutEstimate(unittest.TestCase):
 
         self.assertTrue(timeout.is_specified())
         self.assertEqual(None, timeout.calculate_test_timeout(1))
-        self.assertEqual(54180, timeout.calculate_task_timeout(1))
+        self.assertEqual(54360, timeout.calculate_task_timeout(1))
 
     @patch(ns("HistoricTaskData.from_s3"))
     def test_all_tests_with_runtime_history_should_use_custom_timeout(
@@ -191,7 +191,7 @@ class TestGetTimeoutEstimate(unittest.TestCase):
 
         self.assertTrue(timeout.is_specified())
         self.assertEqual(1860, timeout.calculate_test_timeout(1))
-        self.assertEqual(54180, timeout.calculate_task_timeout(1))
+        self.assertEqual(54360, timeout.calculate_task_timeout(1))
 
 
 class TestGetTaskHookOverhead(unittest.TestCase):
diff --git a/buildscripts/timeouts/timeout.py b/buildscripts/timeouts/timeout.py
index 42f13d29579..f9689e26eca 100644
--- a/buildscripts/timeouts/timeout.py
+++ b/buildscripts/timeouts/timeout.py
@@ -12,7 +12,7 @@ from shrub.v2.command import timeout_update
 
 LOGGER = structlog.getLogger(__name__)
 
-AVG_TASK_SETUP_TIME = int(timedelta(minutes=2).total_seconds())
+AVG_TASK_SETUP_TIME = int(timedelta(minutes=5).total_seconds())
 MIN_TIMEOUT_SECONDS = int(timedelta(minutes=5).total_seconds())
 MAX_EXPECTED_TIMEOUT = int(timedelta(hours=48).total_seconds())
 DEFAULT_SCALING_FACTOR = 3.0