diff --git a/Android.bp b/Android.bp
index 5f769ee..5df8444 100644
--- a/Android.bp
+++ b/Android.bp
@@ -821,6 +821,15 @@
 }
 
 filegroup {
+    name: "update_engine_host_unittest_timeout_srcs",
+    srcs: [
+        "common/action_processor_unittest.cc",
+        "common/file_fetcher_unittest.cc",
+        "payload_generator/delta_diff_utils_unittest.cc",
+    ],
+}
+
+filegroup {
     name: "update_engine_host_unittest_srcs",
     srcs: [
         "common/action_pipe_unittest.cc",
@@ -876,6 +885,7 @@
     cflags: [
         "-g3",
     ],
+    tidy_timeout_srcs: [":update_engine_host_unittest_timeout_srcs"],
     srcs: [":update_engine_host_unittest_srcs"],
     data: [
         ":ue_unittest_delta_generator",
@@ -940,6 +950,13 @@
     test_config: "test_config.xml",
     test_suites: ["device-tests"],
 
+    tidy_timeout_srcs: [
+        ":update_engine_host_unittest_timeout_srcs",
+        "aosp/dynamic_partition_control_android_unittest.cc",
+        "common/http_fetcher_unittest.cc",
+        "payload_consumer/delta_performer_integration_test.cc",
+        "payload_consumer/delta_performer_unittest.cc",
+    ],
     srcs: [
         ":update_engine_host_unittest_srcs",
         "aosp/apex_handler_android_unittest.cc",