diff --git a/audio/V2_0/target/AndroidTest.xml b/audio/V2_0/target/AndroidTest.xml
index e84bf69..5172392 100644
--- a/audio/V2_0/target/AndroidTest.xml
+++ b/audio/V2_0/target/AndroidTest.xml
@@ -28,6 +28,6 @@
         <option name="binary-test-disable-framework" value="true"/>
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="precondition-lshal" value="android.hardware.audio@2.0"/>
-        <option name="test-timeout" value="20m"/>
+        <option name="test-timeout" value="30m"/>
     </test>
 </configuration>
diff --git a/audio/V2_0/target_profiling/AndroidTest.xml b/audio/V2_0/target_profiling/AndroidTest.xml
index becd2c8..81345d8 100644
--- a/audio/V2_0/target_profiling/AndroidTest.xml
+++ b/audio/V2_0/target_profiling/AndroidTest.xml
@@ -33,6 +33,6 @@
         <option name="binary-test-disable-framework" value="true"/>
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="precondition-lshal" value="android.hardware.audio@2.0"/>
-        <option name="test-timeout" value="20m"/>
+        <option name="test-timeout" value="30m"/>
     </test>
 </configuration>
diff --git a/audio/effect/V2_0/target/AndroidTest.xml b/audio/effect/V2_0/target/AndroidTest.xml
index eb153a3..949c16a 100644
--- a/audio/effect/V2_0/target/AndroidTest.xml
+++ b/audio/effect/V2_0/target/AndroidTest.xml
@@ -27,6 +27,6 @@
         <option name="binary-test-disable-framework" value="true"/>
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="precondition-lshal" value="android.hardware.audio.effect@2.0"/>
-        <option name="test-timeout" value="1m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/audio/effect/V2_0/target_profiling/AndroidTest.xml b/audio/effect/V2_0/target_profiling/AndroidTest.xml
index 8c0e735..1dbdf0e 100644
--- a/audio/effect/V2_0/target_profiling/AndroidTest.xml
+++ b/audio/effect/V2_0/target_profiling/AndroidTest.xml
@@ -33,6 +33,6 @@
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="enable-profiling" value="true"/>
         <option name="precondition-lshal" value="android.hardware.audio.effect@2.0"/>
-        <option name="test-timeout" value="5m"/>
+        <option name="test-timeout" value="15m"/>
     </test>
 </configuration>
diff --git a/automotive/vehicle/V2_0/host/AndroidTest.xml b/automotive/vehicle/V2_0/host/AndroidTest.xml
index 605c226..d0bd0f1 100644
--- a/automotive/vehicle/V2_0/host/AndroidTest.xml
+++ b/automotive/vehicle/V2_0/host/AndroidTest.xml
@@ -29,6 +29,6 @@
         <option name="test-module-name" value="VtsHalAutomotiveVehicleV2_0Host"/>
         <option name="test-case-path" value="vts/testcases/hal/automotive/vehicle/V2_0/host/VtsHalAutomotiveVehicleV2_0HostTest"/>
         <option name="precondition-lshal" value="android.hardware.automotive.vehicle@2.0"/>
-        <option name="test-timeout" value="1m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/automotive/vehicle/V2_0/host_profiling/AndroidTest.xml b/automotive/vehicle/V2_0/host_profiling/AndroidTest.xml
index b3f0f97..c1d790d 100644
--- a/automotive/vehicle/V2_0/host_profiling/AndroidTest.xml
+++ b/automotive/vehicle/V2_0/host_profiling/AndroidTest.xml
@@ -32,6 +32,6 @@
         <option name="test-case-path" value="vts/testcases/hal/automotive/vehicle/V2_0/host/VtsHalAutomotiveVehicleV2_0HostTest"/>
         <option name="enable-profiling" value="true"/>
         <option name="precondition-lshal" value="android.hardware.automotive.vehicle@2.0"/>
-        <option name="test-timeout" value="1m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/biometrics/fingerprint/V2_1/target/AndroidTest.xml b/biometrics/fingerprint/V2_1/target/AndroidTest.xml
index 39ac560..12a796b 100644
--- a/biometrics/fingerprint/V2_1/target/AndroidTest.xml
+++ b/biometrics/fingerprint/V2_1/target/AndroidTest.xml
@@ -27,6 +27,6 @@
         <option name="binary-test-disable-framework" value="true"/>
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="precondition-lshal" value="android.hardware.biometrics.fingerprint@2.1"/>
-        <option name="test-timeout" value="5m"/>
+        <option name="test-timeout" value="15m"/>
     </test>
 </configuration>
diff --git a/biometrics/fingerprint/V2_1/target_profiling/AndroidTest.xml b/biometrics/fingerprint/V2_1/target_profiling/AndroidTest.xml
index 9638452..ef1cd50 100644
--- a/biometrics/fingerprint/V2_1/target_profiling/AndroidTest.xml
+++ b/biometrics/fingerprint/V2_1/target_profiling/AndroidTest.xml
@@ -31,6 +31,6 @@
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="enable-profiling" value="true"/>
         <option name="precondition-lshal" value="android.hardware.biometrics.fingerprint@2.1"/>
-        <option name="test-timeout" value="5m"/>
+        <option name="test-timeout" value="15m"/>
     </test>
 </configuration>
diff --git a/biometrics/fingerprint/V2_1/target_replay/AndroidTest.xml b/biometrics/fingerprint/V2_1/target_replay/AndroidTest.xml
index 6c26302..17da8c6 100644
--- a/biometrics/fingerprint/V2_1/target_replay/AndroidTest.xml
+++ b/biometrics/fingerprint/V2_1/target_replay/AndroidTest.xml
@@ -31,6 +31,6 @@
         <option name="hal-hidl-replay-test-trace-path" value="test/vts-testcase/hal-trace/biometrics/fingerprint/V2_1/android.hardware.biometrics.fingerprint@2.1_sailfish_1.vts.trace"/>
         <option name="hal-hidl-package-name" value="android.hardware.biometrics.fingerprint@2.1"/>
         <option name="precondition-lshal" value="android.hardware.biometrics.fingerprint@2.1"/>
-        <option name="test-timeout" value="1m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/bluetooth/V1_0/target/AndroidTest.xml b/bluetooth/V1_0/target/AndroidTest.xml
index b18923b..dd10adc 100644
--- a/bluetooth/V1_0/target/AndroidTest.xml
+++ b/bluetooth/V1_0/target/AndroidTest.xml
@@ -26,6 +26,6 @@
         <option name="binary-test-type" value="hal_hidl_gtest"/>
         <option name="binary-test-disable-framework" value="true"/>
         <option name="precondition-lshal" value="android.hardware.bluetooth@1.0"/>
-        <option name="test-timeout" value="3m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/bluetooth/V1_0/target_profiling/AndroidTest.xml b/bluetooth/V1_0/target_profiling/AndroidTest.xml
index 0290cda..24a5972 100644
--- a/bluetooth/V1_0/target_profiling/AndroidTest.xml
+++ b/bluetooth/V1_0/target_profiling/AndroidTest.xml
@@ -30,6 +30,6 @@
         <option name="binary-test-disable-framework" value="true"/>
         <option name="enable-profiling" value="true"/>
         <option name="precondition-lshal" value="android.hardware.bluetooth@1.0"/>
-        <option name="test-timeout" value="3m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/boot/V1_0/target/AndroidTest.xml b/boot/V1_0/target/AndroidTest.xml
index 470e578..38f1b0c 100644
--- a/boot/V1_0/target/AndroidTest.xml
+++ b/boot/V1_0/target/AndroidTest.xml
@@ -27,6 +27,6 @@
         <option name="binary-test-disable-framework" value="true"/>
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="precondition-lshal" value="android.hardware.boot@1.0"/>
-        <option name="test-timeout" value="1m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/boot/V1_0/target_profiling/AndroidTest.xml b/boot/V1_0/target_profiling/AndroidTest.xml
index 2d25a0f..abe044c 100644
--- a/boot/V1_0/target_profiling/AndroidTest.xml
+++ b/boot/V1_0/target_profiling/AndroidTest.xml
@@ -31,6 +31,6 @@
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="enable-profiling" value="true"/>
         <option name="precondition-lshal" value="android.hardware.boot@1.0"/>
-        <option name="test-timeout" value="5m"/>
+        <option name="test-timeout" value="15m"/>
     </test>
 </configuration>
diff --git a/broadcastradio/V1_0/target/AndroidTest.xml b/broadcastradio/V1_0/target/AndroidTest.xml
index 93d2f75..2604239 100644
--- a/broadcastradio/V1_0/target/AndroidTest.xml
+++ b/broadcastradio/V1_0/target/AndroidTest.xml
@@ -27,6 +27,6 @@
         <option name="binary-test-disable-framework" value="true"/>
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="precondition-lshal" value="android.hardware.broadcastradio@1.0"/>
-        <option name="test-timeout" value="5m"/>
+        <option name="test-timeout" value="15m"/>
     </test>
 </configuration>
diff --git a/broadcastradio/V1_0/target_profiling/AndroidTest.xml b/broadcastradio/V1_0/target_profiling/AndroidTest.xml
index 8234ef3..e0b1038 100644
--- a/broadcastradio/V1_0/target_profiling/AndroidTest.xml
+++ b/broadcastradio/V1_0/target_profiling/AndroidTest.xml
@@ -31,6 +31,6 @@
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="enable-profiling" value="true"/>
         <option name="precondition-lshal" value="android.hardware.broadcastradio@1.0"/>
-        <option name="test-timeout" value="5m"/>
+        <option name="test-timeout" value="15m"/>
     </test>
 </configuration>
diff --git a/camera/provider/V2_4/target/AndroidTest.xml b/camera/provider/V2_4/target/AndroidTest.xml
index 0cb7213..e000a31 100644
--- a/camera/provider/V2_4/target/AndroidTest.xml
+++ b/camera/provider/V2_4/target/AndroidTest.xml
@@ -25,6 +25,6 @@
         <option name="binary-test-type" value="hal_hidl_gtest"/>
         <option name="precondition-lshal" value="android.hardware.camera.provider@2.4"/>
         <option name="skip-on-64bit-abi" value="true"/>
-        <option name="test-timeout" value="10m"/>
+        <option name="test-timeout" value="15m"/>
     </test>
 </configuration>
diff --git a/camera/provider/V2_4/target_profiling/AndroidTest.xml b/camera/provider/V2_4/target_profiling/AndroidTest.xml
index 4e213a0..c47be32 100644
--- a/camera/provider/V2_4/target_profiling/AndroidTest.xml
+++ b/camera/provider/V2_4/target_profiling/AndroidTest.xml
@@ -37,6 +37,6 @@
         <option name="enable-profiling" value="true"/>
         <option name="precondition-lshal" value="android.hardware.camera.provider@2.4"/>
         <option name="skip-on-64bit-abi" value="true"/>
-        <option name="test-timeout" value="25m"/>
+        <option name="test-timeout" value="45m"/>
     </test>
 </configuration>
diff --git a/configstore/V1_0/target/AndroidTest.xml b/configstore/V1_0/target/AndroidTest.xml
index ba95828..aaf4674 100644
--- a/configstore/V1_0/target/AndroidTest.xml
+++ b/configstore/V1_0/target/AndroidTest.xml
@@ -27,6 +27,6 @@
         <option name="binary-test-disable-framework" value="true"/>
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="precondition-lshal" value="android.hardware.configstore@1.0"/>
-        <option name="test-timeout" value="1m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/configstore/V1_0/target_profiling/AndroidTest.xml b/configstore/V1_0/target_profiling/AndroidTest.xml
index 7b0e20f..2fe3de6 100644
--- a/configstore/V1_0/target_profiling/AndroidTest.xml
+++ b/configstore/V1_0/target_profiling/AndroidTest.xml
@@ -31,6 +31,6 @@
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="enable-profiling" value="true"/>
         <option name="precondition-lshal" value="android.hardware.configstore@1.0"/>
-        <option name="test-timeout" value="1m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/contexthub/V1_0/host/AndroidTest.xml b/contexthub/V1_0/host/AndroidTest.xml
index e55faad..b06a420 100644
--- a/contexthub/V1_0/host/AndroidTest.xml
+++ b/contexthub/V1_0/host/AndroidTest.xml
@@ -29,6 +29,6 @@
         <option name="test-module-name" value="VtsHalContexthubV1_0Host"/>
         <option name="test-case-path" value="vts/testcases/hal/contexthub/V1_0/host/VtsHalContexthubV1_0HostTest"/>
         <option name="precondition-lshal" value="android.hardware.contexthub@1.0"/>
-        <option name="test-timeout" value="1m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/contexthub/V1_0/target/AndroidTest.xml b/contexthub/V1_0/target/AndroidTest.xml
index 8b19d20..45224fb 100644
--- a/contexthub/V1_0/target/AndroidTest.xml
+++ b/contexthub/V1_0/target/AndroidTest.xml
@@ -27,6 +27,6 @@
         <option name="binary-test-disable-framework" value="true"/>
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="precondition-lshal" value="android.hardware.contexthub@1.0"/>
-        <option name="test-timeout" value="10m"/>
+        <option name="test-timeout" value="15m"/>
     </test>
 </configuration>
diff --git a/contexthub/V1_0/target_profiling/AndroidTest.xml b/contexthub/V1_0/target_profiling/AndroidTest.xml
index e4d2faa..e75f7ea 100644
--- a/contexthub/V1_0/target_profiling/AndroidTest.xml
+++ b/contexthub/V1_0/target_profiling/AndroidTest.xml
@@ -31,6 +31,6 @@
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="enable-profiling" value="true"/>
         <option name="precondition-lshal" value="android.hardware.contexthub@1.0"/>
-        <option name="test-timeout" value="10m"/>
+        <option name="test-timeout" value="15m"/>
     </test>
 </configuration>
diff --git a/contexthub/V1_0/target_replay/AndroidTest.xml b/contexthub/V1_0/target_replay/AndroidTest.xml
index caac85a..b349226 100644
--- a/contexthub/V1_0/target_replay/AndroidTest.xml
+++ b/contexthub/V1_0/target_replay/AndroidTest.xml
@@ -31,6 +31,6 @@
         <option name="hal-hidl-replay-test-trace-path" value="test/vts-testcase/hal-trace/contexthub/V1_0/android.hardware.contexthub@1.0_sailfish_1.vts.trace"/>
         <option name="hal-hidl-package-name" value="android.hardware.contexthub@1.0"/>
         <option name="precondition-lshal" value="android.hardware.contexthub@1.0"/>
-        <option name="test-timeout" value="1m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/drm/V1_0/target/AndroidTest.xml b/drm/V1_0/target/AndroidTest.xml
index 44dfb25..9570ee7 100644
--- a/drm/V1_0/target/AndroidTest.xml
+++ b/drm/V1_0/target/AndroidTest.xml
@@ -27,6 +27,6 @@
         <option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalDrmV1_0TargetTest/VtsHalDrmV1_0TargetTest"/>
         <option name="binary-test-type" value="hal_hidl_gtest"/>
         <option name="precondition-lshal" value="android.hardware.drm@1.0"/>
-        <option name="test-timeout" value="10m"/>
+        <option name="test-timeout" value="15m"/>
     </test>
 </configuration>
diff --git a/drm/V1_0/target_profiling/AndroidTest.xml b/drm/V1_0/target_profiling/AndroidTest.xml
index ec2e238..f936094 100644
--- a/drm/V1_0/target_profiling/AndroidTest.xml
+++ b/drm/V1_0/target_profiling/AndroidTest.xml
@@ -31,6 +31,6 @@
         <option name="binary-test-type" value="hal_hidl_gtest"/>
         <option name="enable-profiling" value="true"/>
         <option name="precondition-lshal" value="android.hardware.drm@1.0"/>
-        <option name="test-timeout" value="10m"/>
+        <option name="test-timeout" value="15m"/>
     </test>
 </configuration>
diff --git a/gatekeeper/V1_0/target/AndroidTest.xml b/gatekeeper/V1_0/target/AndroidTest.xml
index c663c9e..5f3e3f0 100644
--- a/gatekeeper/V1_0/target/AndroidTest.xml
+++ b/gatekeeper/V1_0/target/AndroidTest.xml
@@ -27,6 +27,6 @@
         <option name="binary-test-disable-framework" value="true"/>
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="precondition-lshal" value="android.hardware.gatekeeper@1.0"/>
-        <option name="test-timeout" value="5m"/>
+        <option name="test-timeout" value="15m"/>
     </test>
 </configuration>
diff --git a/gatekeeper/V1_0/target_profiling/AndroidTest.xml b/gatekeeper/V1_0/target_profiling/AndroidTest.xml
index d810c70..a533eb4 100644
--- a/gatekeeper/V1_0/target_profiling/AndroidTest.xml
+++ b/gatekeeper/V1_0/target_profiling/AndroidTest.xml
@@ -31,6 +31,6 @@
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="enable-profiling" value="true"/>
         <option name="precondition-lshal" value="android.hardware.gatekeeper@1.0"/>
-        <option name="test-timeout" value="5m"/>
+        <option name="test-timeout" value="15m"/>
     </test>
 </configuration>
diff --git a/gnss/V1_0/target/AndroidTest.xml b/gnss/V1_0/target/AndroidTest.xml
index 7b4aa21..c15a260 100644
--- a/gnss/V1_0/target/AndroidTest.xml
+++ b/gnss/V1_0/target/AndroidTest.xml
@@ -27,6 +27,6 @@
         <option name="binary-test-disable-framework" value="true"/>
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="precondition-lshal" value="android.hardware.gnss@1.0"/>
-        <option name="test-timeout" value="10m"/>
+        <option name="test-timeout" value="15m"/>
     </test>
 </configuration>
diff --git a/gnss/V1_0/target_profiling/AndroidTest.xml b/gnss/V1_0/target_profiling/AndroidTest.xml
index 22ff140..67537a6 100644
--- a/gnss/V1_0/target_profiling/AndroidTest.xml
+++ b/gnss/V1_0/target_profiling/AndroidTest.xml
@@ -31,6 +31,6 @@
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="enable-profiling" value="true"/>
         <option name="precondition-lshal" value="android.hardware.gnss@1.0"/>
-        <option name="test-timeout" value="10m"/>
+        <option name="test-timeout" value="15m"/>
     </test>
 </configuration>
diff --git a/graphics/composer/V2_1/target/AndroidTest.xml b/graphics/composer/V2_1/target/AndroidTest.xml
index 611da9c..869028e 100644
--- a/graphics/composer/V2_1/target/AndroidTest.xml
+++ b/graphics/composer/V2_1/target/AndroidTest.xml
@@ -27,6 +27,6 @@
         <option name="binary-test-disable-framework" value="true"/>
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="precondition-lshal" value="android.hardware.graphics.composer@2.1"/>
-        <option name="test-timeout" value="2m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/graphics/composer/V2_1/target_profiling/AndroidTest.xml b/graphics/composer/V2_1/target_profiling/AndroidTest.xml
index 7f66dd5..240e6c2 100644
--- a/graphics/composer/V2_1/target_profiling/AndroidTest.xml
+++ b/graphics/composer/V2_1/target_profiling/AndroidTest.xml
@@ -33,6 +33,6 @@
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="enable-profiling" value="true"/>
         <option name="precondition-lshal" value="android.hardware.graphics.composer@2.1"/>
-        <option name="test-timeout" value="3m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/graphics/mapper/V2_0/target/AndroidTest.xml b/graphics/mapper/V2_0/target/AndroidTest.xml
index 1ac4671..658e268 100644
--- a/graphics/mapper/V2_0/target/AndroidTest.xml
+++ b/graphics/mapper/V2_0/target/AndroidTest.xml
@@ -27,6 +27,6 @@
         <option name="binary-test-disable-framework" value="true"/>
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="precondition-lshal" value="android.hardware.graphics.mapper@2.0"/>
-        <option name="test-timeout" value="1m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/graphics/mapper/V2_0/target_profiling/AndroidTest.xml b/graphics/mapper/V2_0/target_profiling/AndroidTest.xml
index 2c54d8b..ca61733 100644
--- a/graphics/mapper/V2_0/target_profiling/AndroidTest.xml
+++ b/graphics/mapper/V2_0/target_profiling/AndroidTest.xml
@@ -33,6 +33,6 @@
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="enable-profiling" value="true"/>
         <option name="precondition-lshal" value="android.hardware.graphics.mapper@2.0"/>
-        <option name="test-timeout" value="1m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/health/V1_0/target/AndroidTest.xml b/health/V1_0/target/AndroidTest.xml
index 9bcfe78..3692a5e 100644
--- a/health/V1_0/target/AndroidTest.xml
+++ b/health/V1_0/target/AndroidTest.xml
@@ -27,6 +27,6 @@
         <option name="binary-test-disable-framework" value="true"/>
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="precondition-lshal" value="android.hardware.health@1.0"/>
-        <option name="test-timeout" value="1m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/ir/V1_0/target/AndroidTest.xml b/ir/V1_0/target/AndroidTest.xml
index 9eeea6e..da5d53a 100644
--- a/ir/V1_0/target/AndroidTest.xml
+++ b/ir/V1_0/target/AndroidTest.xml
@@ -27,6 +27,6 @@
         <option name="binary-test-disable-framework" value="true"/>
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="precondition-lshal" value="android.hardware.ir@1.0"/>
-        <option name="test-timeout" value="1m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/ir/V1_0/target_profiling/AndroidTest.xml b/ir/V1_0/target_profiling/AndroidTest.xml
index 180d4f3..07a2392 100644
--- a/ir/V1_0/target_profiling/AndroidTest.xml
+++ b/ir/V1_0/target_profiling/AndroidTest.xml
@@ -31,6 +31,6 @@
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="enable-profiling" value="true"/>
         <option name="precondition-lshal" value="android.hardware.ir@1.0"/>
-        <option name="test-timeout" value="1m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/keymaster/V3_0/target/AndroidTest.xml b/keymaster/V3_0/target/AndroidTest.xml
index 8d22aca..6f0ec3a 100644
--- a/keymaster/V3_0/target/AndroidTest.xml
+++ b/keymaster/V3_0/target/AndroidTest.xml
@@ -25,6 +25,6 @@
         <option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalKeymasterV3_0TargetTest/VtsHalKeymasterV3_0TargetTest" />
         <option name="binary-test-type" value="hal_hidl_gtest"/>
         <option name="precondition-lshal" value="android.hardware.keymaster@3.0"/>
-        <option name="test-timeout" value="5m"/>
+        <option name="test-timeout" value="15m"/>
     </test>
 </configuration>
diff --git a/keymaster/V3_0/target_profiling/AndroidTest.xml b/keymaster/V3_0/target_profiling/AndroidTest.xml
index 4907820..8778c55 100644
--- a/keymaster/V3_0/target_profiling/AndroidTest.xml
+++ b/keymaster/V3_0/target_profiling/AndroidTest.xml
@@ -28,6 +28,6 @@
         <option name="binary-test-type" value="hal_hidl_gtest"/>
         <option name="precondition-lshal" value="android.hardware.keymaster@3.0"/>
         <option name="enable-profiling" value="true"/>
-        <option name="test-timeout" value="5m"/>
+        <option name="test-timeout" value="15m"/>
     </test>
 </configuration>
diff --git a/keymaster/V3_0/target_replay/AndroidTest.xml b/keymaster/V3_0/target_replay/AndroidTest.xml
index 2779e07..d6450eb 100644
--- a/keymaster/V3_0/target_replay/AndroidTest.xml
+++ b/keymaster/V3_0/target_replay/AndroidTest.xml
@@ -30,6 +30,6 @@
         <option name="hal-hidl-replay-test-trace-path" value="test/vts-testcase/hal-trace/keymaster/V3_0/android.hardware.keymaster@3.0_sailfish_1.vts.trace"/>
         <option name="hal-hidl-package-name" value="android.hardware.keymaster@3.0"/>
         <option name="precondition-lshal" value="android.hardware.keymaster@3.0"/>
-        <option name="test-timeout" value="1m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/light/V2_0/target/AndroidTest.xml b/light/V2_0/target/AndroidTest.xml
index 9ad0b6b..7942b31 100644
--- a/light/V2_0/target/AndroidTest.xml
+++ b/light/V2_0/target/AndroidTest.xml
@@ -27,6 +27,6 @@
         <option name="binary-test-disable-framework" value="true"/>
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="precondition-lshal" value="android.hardware.light@2.0"/>
-        <option name="test-timeout" value="1m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/light/V2_0/target_profiling/AndroidTest.xml b/light/V2_0/target_profiling/AndroidTest.xml
index 75323c2..5648a9a 100644
--- a/light/V2_0/target_profiling/AndroidTest.xml
+++ b/light/V2_0/target_profiling/AndroidTest.xml
@@ -31,6 +31,6 @@
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="enable-profiling" value="true"/>
         <option name="precondition-lshal" value="android.hardware.light@2.0"/>
-        <option name="test-timeout" value="1m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/light/V2_0/target_replay/AndroidTest.xml b/light/V2_0/target_replay/AndroidTest.xml
index a39c689..38eed82 100644
--- a/light/V2_0/target_replay/AndroidTest.xml
+++ b/light/V2_0/target_replay/AndroidTest.xml
@@ -28,6 +28,6 @@
         <option name="binary-test-type" value="hal_hidl_replay_test" />
         <option name="hal-hidl-replay-test-trace-path" value="test/vts-testcase/hal-trace/light/V2_0/android.hardware.light@2.0_sailfish_1.vts.trace" />
         <option name="hal-hidl-package-name" value="android.hardware.light@2.0" />
-        <option name="test-timeout" value="3m" />
+        <option name="test-timeout" value="5m" />
     </test>
 </configuration>
diff --git a/memtrack/V1_0/target/AndroidTest.xml b/memtrack/V1_0/target/AndroidTest.xml
index 008e364..df9cc62 100644
--- a/memtrack/V1_0/target/AndroidTest.xml
+++ b/memtrack/V1_0/target/AndroidTest.xml
@@ -27,6 +27,6 @@
         <option name="binary-test-disable-framework" value="true"/>
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="precondition-lshal" value="android.hardware.memtrack@1.0"/>
-        <option name="test-timeout" value="5m"/>
+        <option name="test-timeout" value="15m"/>
     </test>
 </configuration>
diff --git a/memtrack/V1_0/target_profiling/AndroidTest.xml b/memtrack/V1_0/target_profiling/AndroidTest.xml
index 2a8ba6d..1b2f632 100644
--- a/memtrack/V1_0/target_profiling/AndroidTest.xml
+++ b/memtrack/V1_0/target_profiling/AndroidTest.xml
@@ -31,6 +31,6 @@
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="enable-profiling" value="true"/>
         <option name="precondition-lshal" value="android.hardware.memtrack@1.0"/>
-        <option name="test-timeout" value="5m"/>
+        <option name="test-timeout" value="15m"/>
     </test>
 </configuration>
diff --git a/memtrack/V1_0/target_replay/AndroidTest.xml b/memtrack/V1_0/target_replay/AndroidTest.xml
index a52a0fb..4f5ad9b 100644
--- a/memtrack/V1_0/target_replay/AndroidTest.xml
+++ b/memtrack/V1_0/target_replay/AndroidTest.xml
@@ -28,6 +28,6 @@
         <option name="binary-test-type" value="hal_hidl_replay_test" />
         <option name="hal-hidl-replay-test-trace-path" value="test/vts-testcase/hal-trace/memtrack/V1_0/android.hardware.memtrack@1.0_sailfish_1.vts.trace" />
         <option name="hal-hidl-package-name" value="android.hardware.memtrack@1.0" />
-        <option name="test-timeout" value="5m"/>
+        <option name="test-timeout" value="15m"/>
     </test>
 </configuration>
diff --git a/nfc/V1_0/host/binderize/AndroidTest.xml b/nfc/V1_0/host/binderize/AndroidTest.xml
index 749a934..b204928 100644
--- a/nfc/V1_0/host/binderize/AndroidTest.xml
+++ b/nfc/V1_0/host/binderize/AndroidTest.xml
@@ -29,5 +29,6 @@
         <option name="test-module-name" value="VtsHalNfcV1_0HostBinderize" />
         <option name="test-case-path" value="vts/testcases/hal/nfc/V1_0/host/VtsHalNfcV1_0HostTest" />
         <option name="test-config-path" value="vts/testcases/hal/nfc/V1_0/host/binderize/NfcHidlBinderizeBasicTest.config" />
+        <option name="test-timeout" value="30m"/>
     </test>
 </configuration>
diff --git a/nfc/V1_0/host/passthrough/AndroidTest.xml b/nfc/V1_0/host/passthrough/AndroidTest.xml
index 5219de3..f21039f 100644
--- a/nfc/V1_0/host/passthrough/AndroidTest.xml
+++ b/nfc/V1_0/host/passthrough/AndroidTest.xml
@@ -29,5 +29,6 @@
         <option name="test-module-name" value="VtsHalNfcV1_0HostPassthrough" />
         <option name="test-case-path" value="vts/testcases/hal/nfc/V1_0/host/VtsHalNfcV1_0HostTest" />
         <option name="test-config-path" value="vts/testcases/hal/nfc/V1_0/host/passthrough/NfcHidlPassthroughBasicTest.config" />
+        <option name="test-timeout" value="30m"/>
     </test>
 </configuration>
diff --git a/nfc/V1_0/host_profiling/AndroidTest.xml b/nfc/V1_0/host_profiling/AndroidTest.xml
index 65fa7e6..4e8a7be 100644
--- a/nfc/V1_0/host_profiling/AndroidTest.xml
+++ b/nfc/V1_0/host_profiling/AndroidTest.xml
@@ -32,6 +32,6 @@
         <option name="test-case-path" value="vts/testcases/hal/nfc/V1_0/host/VtsHalNfcV1_0HostTest"/>
         <option name="enable-profiling" value="true"/>
         <option name="precondition-lshal" value="android.hardware.nfc@1.0"/>
-        <option name="test-timeout" value="1m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/nfc/V1_0/target/AndroidTest.xml b/nfc/V1_0/target/AndroidTest.xml
index eca3cc9..a743358 100644
--- a/nfc/V1_0/target/AndroidTest.xml
+++ b/nfc/V1_0/target/AndroidTest.xml
@@ -27,6 +27,6 @@
         <option name="binary-test-disable-framework" value="true"/>
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="precondition-lshal" value="android.hardware.nfc@1.0"/>
-        <option name="test-timeout" value="10m"/>
+        <option name="test-timeout" value="15m"/>
     </test>
 </configuration>
diff --git a/nfc/V1_0/target_profiling/AndroidTest.xml b/nfc/V1_0/target_profiling/AndroidTest.xml
index c188762..240c8af 100644
--- a/nfc/V1_0/target_profiling/AndroidTest.xml
+++ b/nfc/V1_0/target_profiling/AndroidTest.xml
@@ -31,6 +31,6 @@
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="enable-profiling" value="true"/>
         <option name="precondition-lshal" value="android.hardware.nfc@1.0"/>
-        <option name="test-timeout" value="25m"/>
+        <option name="test-timeout" value="30m"/>
     </test>
 </configuration>
diff --git a/nfc/V1_0/target_replay/AndroidTest.xml b/nfc/V1_0/target_replay/AndroidTest.xml
index 51ce03c..0f45c3a 100644
--- a/nfc/V1_0/target_replay/AndroidTest.xml
+++ b/nfc/V1_0/target_replay/AndroidTest.xml
@@ -32,6 +32,6 @@
         <option name="hal-hidl-replay-test-trace-path" value="test/vts-testcase/hal-trace/nfc/V1_0/android.hardware.nfc@1.0_sailfish_1.vts.trace"/>
         <option name="hal-hidl-package-name" value="android.hardware.nfc@1.0"/>
         <option name="precondition-lshal" value="android.hardware.nfc@1.0"/>
-        <option name="test-timeout" value="3m"/>
+        <option name="test-timeout" value="15m"/>
     </test>
 </configuration>
diff --git a/power/V1_0/target/AndroidTest.xml b/power/V1_0/target/AndroidTest.xml
index 03f7714..1353e36 100644
--- a/power/V1_0/target/AndroidTest.xml
+++ b/power/V1_0/target/AndroidTest.xml
@@ -27,6 +27,6 @@
         <option name="binary-test-disable-framework" value="true"/>
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="precondition-lshal" value="android.hardware.power@1.0"/>
-        <option name="test-timeout" value="2m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/power/V1_0/target_profiling/AndroidTest.xml b/power/V1_0/target_profiling/AndroidTest.xml
index 85d02a9..db17918 100644
--- a/power/V1_0/target_profiling/AndroidTest.xml
+++ b/power/V1_0/target_profiling/AndroidTest.xml
@@ -31,6 +31,6 @@
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="enable-profiling" value="true"/>
         <option name="precondition-lshal" value="android.hardware.power@1.0"/>
-        <option name="test-timeout" value="2m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/power/V1_0/target_replay/AndroidTest.xml b/power/V1_0/target_replay/AndroidTest.xml
index fd9d3b1..983754b 100644
--- a/power/V1_0/target_replay/AndroidTest.xml
+++ b/power/V1_0/target_replay/AndroidTest.xml
@@ -28,6 +28,6 @@
         <option name="binary-test-type" value="hal_hidl_replay_test" />
         <option name="hal-hidl-replay-test-trace-path" value="test/vts-testcase/hal-trace/power/V1_0/android.hardware.power@1.0_sailfish_1.vts.trace" />
         <option name="hal-hidl-package-name" value="android.hardware.power@1.0" />
-        <option name="test-timeout" value="2m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/radio/V1_0/host/AndroidTest.xml b/radio/V1_0/host/AndroidTest.xml
index 0082c7b..0ccfca0 100644
--- a/radio/V1_0/host/AndroidTest.xml
+++ b/radio/V1_0/host/AndroidTest.xml
@@ -32,6 +32,6 @@
         <option name="test-module-name" value="VtsHalRadioV1_0Host"/>
         <option name="test-case-path" value="vts/testcases/hal/radio/V1_0/host/VtsHalRadioV1_0HostTest"/>
         <option name="precondition-lshal" value="android.hardware.radio@1.0"/>
-        <option name="test-timeout" value="15m"/>
+        <option name="test-timeout" value="30m"/>
     </test>
 </configuration>
diff --git a/radio/V1_0/target/AndroidTest.xml b/radio/V1_0/target/AndroidTest.xml
index 9731d36..27f7b93 100644
--- a/radio/V1_0/target/AndroidTest.xml
+++ b/radio/V1_0/target/AndroidTest.xml
@@ -29,12 +29,12 @@
         <option name="binary-test-disable-framework" value="true"/>
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="precondition-lshal" value="android.hardware.radio@1.0"/>
-        <option name="test-timeout" value="10m"/>
         <option name="exclude-filter" value="RadioHidlTest.getDataCallList" />
         <option name="exclude-filter" value="RadioHidlTest.setRadioCapability" />
         <option name="exclude-filter" value="RadioHidlTest.sendCDMAFeatureCode" />
         <option name="exclude-filter" value="RadioHidlTest.setSimCardPower" />
         <option name="exclude-filter" value="SapHidlTest.transferAtrReq" />
         <option name="exclude-filter" value="RadioHidlTest.dial" />
+        <option name="test-timeout" value="15m"/>
     </test>
 </configuration>
diff --git a/radio/V1_0/target_profiling/AndroidTest.xml b/radio/V1_0/target_profiling/AndroidTest.xml
index 660a5d7..25d22b7 100644
--- a/radio/V1_0/target_profiling/AndroidTest.xml
+++ b/radio/V1_0/target_profiling/AndroidTest.xml
@@ -33,6 +33,6 @@
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="enable-profiling" value="true"/>
         <option name="precondition-lshal" value="android.hardware.radio@1.0"/>
-        <option name="test-timeout" value="10m"/>
+        <option name="test-timeout" value="15m"/>
     </test>
 </configuration>
diff --git a/renderscript/V1_0/target/AndroidTest.xml b/renderscript/V1_0/target/AndroidTest.xml
index f023b20..92634e8 100644
--- a/renderscript/V1_0/target/AndroidTest.xml
+++ b/renderscript/V1_0/target/AndroidTest.xml
@@ -25,6 +25,6 @@
         <option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalRenderscriptV1_0TargetTest/VtsHalRenderscriptV1_0TargetTest"/>
         <option name="binary-test-type" value="hal_hidl_gtest"/>
         <option name="precondition-lshal" value="android.hardware.renderscript@1.0"/>
-        <option name="test-timeout" value="1m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/sensors/V1_0/host/AndroidTest.xml b/sensors/V1_0/host/AndroidTest.xml
index 8bda3a9..9b979f2 100644
--- a/sensors/V1_0/host/AndroidTest.xml
+++ b/sensors/V1_0/host/AndroidTest.xml
@@ -28,6 +28,6 @@
         <option name="test-module-name" value="VtsHalSensorsV1_0Host"/>
         <option name="test-case-path" value="vts/testcases/hal/sensors/V1_0/host/VtsHalSensorsV1_0HostTest"/>
         <option name="precondition-lshal" value="android.hardware.sensors@1.0"/>
-        <option name="test-timeout" value="3m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/sensors/V1_0/host_profiling/AndroidTest.xml b/sensors/V1_0/host_profiling/AndroidTest.xml
index e2becc7..652512d 100644
--- a/sensors/V1_0/host_profiling/AndroidTest.xml
+++ b/sensors/V1_0/host_profiling/AndroidTest.xml
@@ -31,6 +31,6 @@
         <option name="test-case-path" value="vts/testcases/hal/sensors/V1_0/host/VtsHalSensorsV1_0HostTest"/>
         <option name="enable-profiling" value="true"/>
         <option name="precondition-lshal" value="android.hardware.sensors@1.0"/>
-        <option name="test-timeout" value="3m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/sensors/V1_0/target/AndroidTest.xml b/sensors/V1_0/target/AndroidTest.xml
index ced1db4..d9ead28 100644
--- a/sensors/V1_0/target/AndroidTest.xml
+++ b/sensors/V1_0/target/AndroidTest.xml
@@ -27,6 +27,6 @@
         <option name="binary-test-disable-framework" value="true"/>
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="precondition-lshal" value="android.hardware.sensors@1.0"/>
-        <option name="test-timeout" value="10m"/>
+        <option name="test-timeout" value="15m"/>
     </test>
 </configuration>
diff --git a/sensors/V1_0/target_profiling/AndroidTest.xml b/sensors/V1_0/target_profiling/AndroidTest.xml
index 34a4690..ef6fe27 100644
--- a/sensors/V1_0/target_profiling/AndroidTest.xml
+++ b/sensors/V1_0/target_profiling/AndroidTest.xml
@@ -31,6 +31,6 @@
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="enable-profiling" value="true"/>
         <option name="precondition-lshal" value="android.hardware.sensors@1.0"/>
-        <option name="test-timeout" value="10m"/>
+        <option name="test-timeout" value="15m"/>
     </test>
 </configuration>
diff --git a/soundtrigger/V2_0/target/AndroidTest.xml b/soundtrigger/V2_0/target/AndroidTest.xml
index 7387de0..6fe5197 100644
--- a/soundtrigger/V2_0/target/AndroidTest.xml
+++ b/soundtrigger/V2_0/target/AndroidTest.xml
@@ -29,6 +29,6 @@
         <option name="precondition-lshal" value="android.hardware.soundtrigger@2.0"/>
         <option name="precondition-file-path-prefix" value="/*/lib/hw/sound_trigger.primary." />
         <option name="skip-on-64bit-abi" value="true" />
-        <option name="test-timeout" value="1m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/soundtrigger/V2_0/target_profiling/AndroidTest.xml b/soundtrigger/V2_0/target_profiling/AndroidTest.xml
index cd37948..b41e29f 100644
--- a/soundtrigger/V2_0/target_profiling/AndroidTest.xml
+++ b/soundtrigger/V2_0/target_profiling/AndroidTest.xml
@@ -35,6 +35,6 @@
         <option name="precondition-lshal" value="android.hardware.soundtrigger@2.0"/>
         <option name="precondition-file-path-prefix" value="/*/lib/hw/sound_trigger.primary." />
         <option name="skip-on-64bit-abi" value="true" />
-        <option name="test-timeout" value="1m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/thermal/V1_0/target/AndroidTest.xml b/thermal/V1_0/target/AndroidTest.xml
index aff16e5..a9bb014 100644
--- a/thermal/V1_0/target/AndroidTest.xml
+++ b/thermal/V1_0/target/AndroidTest.xml
@@ -27,6 +27,6 @@
         <option name="binary-test-disable-framework" value="true"/>
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="precondition-lshal" value="android.hardware.thermal@1.0"/>
-        <option name="test-timeout" value="5m"/>
+        <option name="test-timeout" value="15m"/>
     </test>
 </configuration>
diff --git a/thermal/V1_0/target_profiling/AndroidTest.xml b/thermal/V1_0/target_profiling/AndroidTest.xml
index 579b0c5..01cac2a 100644
--- a/thermal/V1_0/target_profiling/AndroidTest.xml
+++ b/thermal/V1_0/target_profiling/AndroidTest.xml
@@ -31,6 +31,6 @@
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="enable-profiling" value="true"/>
         <option name="precondition-lshal" value="android.hardware.thermal@1.0"/>
-        <option name="test-timeout" value="5m"/>
+        <option name="test-timeout" value="15m"/>
     </test>
 </configuration>
diff --git a/thermal/V1_0/target_stress/AndroidTest.xml b/thermal/V1_0/target_stress/AndroidTest.xml
index 51a4d53..a59d9da 100644
--- a/thermal/V1_0/target_stress/AndroidTest.xml
+++ b/thermal/V1_0/target_stress/AndroidTest.xml
@@ -24,7 +24,7 @@
         <option name="binary-test-source" value="_32bit::DATA/nativetest/thermal_hidl_stress_test/thermal_hidl_stress_test" />
         <option name="binary-test-source" value="_64bit::DATA/nativetest64/thermal_hidl_stress_test/thermal_hidl_stress_test" />
         <option name="binary-test-type" value="gtest" />
-        <option name="test-timeout" value="1m" />
+        <option name="test-timeout" value="5m" />
     </test>
 </configuration>
 
diff --git a/treble/platform_version/AndroidTest.xml b/treble/platform_version/AndroidTest.xml
index 2779d6a..fafaae5 100644
--- a/treble/platform_version/AndroidTest.xml
+++ b/treble/platform_version/AndroidTest.xml
@@ -22,5 +22,6 @@
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsTreblePlatformVersionTest" />
         <option name="test-case-path" value="vts/testcases/hal/treble/platform_version/VtsTreblePlatformVersionTest" />
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/treble/vintf/AndroidTest.xml b/treble/vintf/AndroidTest.xml
index b5084b9..517bac5 100644
--- a/treble/vintf/AndroidTest.xml
+++ b/treble/vintf/AndroidTest.xml
@@ -30,6 +30,6 @@
         <option name="binary-test-source" value="_32bit::DATA/nativetest/vts_treble_vintf_test/vts_treble_vintf_test" />
         <option name="binary-test-source" value="_64bit::DATA/nativetest64/vts_treble_vintf_test/vts_treble_vintf_test" />
         <option name="binary-test-type" value="gtest"/>
-        <option name="test-timeout" value="3m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/tv/cec/V1_0/host/AndroidTest.xml b/tv/cec/V1_0/host/AndroidTest.xml
index 844d3f0..b4d86a1 100644
--- a/tv/cec/V1_0/host/AndroidTest.xml
+++ b/tv/cec/V1_0/host/AndroidTest.xml
@@ -28,6 +28,6 @@
         <option name="test-module-name" value="VtsHalTvCecV1_0Host"/>
         <option name="test-case-path" value="vts/testcases/hal/tv/cec/V1_0/host/VtsHalTvCecV1_0HostTest"/>
         <option name="precondition-lshal" value="android.hardware.tv.cec@1.0"/>
-        <option name="test-timeout" value="1m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/tv/cec/V1_0/host_profiling/AndroidTest.xml b/tv/cec/V1_0/host_profiling/AndroidTest.xml
index d08c00d..19f9066 100644
--- a/tv/cec/V1_0/host_profiling/AndroidTest.xml
+++ b/tv/cec/V1_0/host_profiling/AndroidTest.xml
@@ -30,6 +30,6 @@
         <option name="test-case-path" value="vts/testcases/hal/tv/cec/V1_0/host/VtsHalTvCecV1_0HostTest"/>
         <option name="enable-profiling" value="true"/>
         <option name="precondition-lshal" value="android.hardware.tv.cec@1.0"/>
-        <option name="test-timeout" value="1m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/tv/input/V1_0/host/AndroidTest.xml b/tv/input/V1_0/host/AndroidTest.xml
index 3172e3f..5bed90b 100644
--- a/tv/input/V1_0/host/AndroidTest.xml
+++ b/tv/input/V1_0/host/AndroidTest.xml
@@ -31,6 +31,6 @@
         <option name="test-module-name" value="VtsHalTvInputV1_0Host"/>
         <option name="test-case-path" value="vts/testcases/hal/tv/input/V1_0/host/VtsHalTvInputV1_0HostTest"/>
         <option name="precondition-lshal" value="android.hardware.tv.input@1.0"/>
-        <option name="test-timeout" value="1m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/tv/input/V1_0/host_profiling/AndroidTest.xml b/tv/input/V1_0/host_profiling/AndroidTest.xml
index af5cd36..b4589d8 100644
--- a/tv/input/V1_0/host_profiling/AndroidTest.xml
+++ b/tv/input/V1_0/host_profiling/AndroidTest.xml
@@ -34,6 +34,6 @@
         <option name="test-case-path" value="vts/testcases/hal/tv/input/V1_0/host/VtsHalTvInputV1_0HostTest"/>
         <option name="enable-profiling" value="true"/>
         <option name="precondition-lshal" value="android.hardware.tv.input@1.0"/>
-        <option name="test-timeout" value="1m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/tv/input/V1_0/target/AndroidTest.xml b/tv/input/V1_0/target/AndroidTest.xml
index b3c456a..c461912 100644
--- a/tv/input/V1_0/target/AndroidTest.xml
+++ b/tv/input/V1_0/target/AndroidTest.xml
@@ -27,6 +27,6 @@
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="precondition-lshal" value="android.hardware.tv.input@1.0"/>
         <!-- Needs about 50 seconds if no device. Needs about 15 seconds for every additional device -->
-        <option name="test-timeout" value="5m"/>
+        <option name="test-timeout" value="15m"/>
     </test>
 </configuration>
diff --git a/tv/input/V1_0/target_profiling/AndroidTest.xml b/tv/input/V1_0/target_profiling/AndroidTest.xml
index c691355..460e888 100644
--- a/tv/input/V1_0/target_profiling/AndroidTest.xml
+++ b/tv/input/V1_0/target_profiling/AndroidTest.xml
@@ -31,6 +31,6 @@
         <option name="enable-profiling" value="true"/>
         <option name="precondition-lshal" value="android.hardware.tv.input@1.0"/>
         <!-- Needs about 50 seconds if no device. Needs about 15 seconds for every additional device -->
-        <option name="test-timeout" value="5m"/>
+        <option name="test-timeout" value="15m"/>
     </test>
 </configuration>
diff --git a/usb/V1_0/target/AndroidTest.xml b/usb/V1_0/target/AndroidTest.xml
index 535afac..8011921 100644
--- a/usb/V1_0/target/AndroidTest.xml
+++ b/usb/V1_0/target/AndroidTest.xml
@@ -27,6 +27,6 @@
         <option name="binary-test-disable-framework" value="true"/>
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="precondition-lshal" value="android.hardware.usb@1.0"/>
-        <option name="test-timeout" value="10m"/>
+        <option name="test-timeout" value="15m"/>
     </test>
 </configuration>
diff --git a/usb/V1_0/target_profiling/AndroidTest.xml b/usb/V1_0/target_profiling/AndroidTest.xml
index 9dc765b..b1e86a9 100644
--- a/usb/V1_0/target_profiling/AndroidTest.xml
+++ b/usb/V1_0/target_profiling/AndroidTest.xml
@@ -31,6 +31,6 @@
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="enable-profiling" value="true"/>
         <option name="precondition-lshal" value="android.hardware.usb@1.0"/>
-        <option name="test-timeout" value="10m"/>
+        <option name="test-timeout" value="15m"/>
     </test>
 </configuration>
diff --git a/usb/V1_0/target_replay/AndroidTest.xml b/usb/V1_0/target_replay/AndroidTest.xml
index 0605964..b59c138 100644
--- a/usb/V1_0/target_replay/AndroidTest.xml
+++ b/usb/V1_0/target_replay/AndroidTest.xml
@@ -31,6 +31,6 @@
         <option name="hal-hidl-replay-test-trace-path" value="test/vts-testcase/hal-trace/usb/V1_0/android.hardware.usb@1.0_sailfish_1.vts.trace"/>
         <option name="hal-hidl-package-name" value="android.hardware.usb@1.0"/>
         <option name="precondition-lshal" value="android.hardware.usb@1.0"/>
-        <option name="test-timeout" value="1m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/vibrator/V1_0/host/AndroidTest.xml b/vibrator/V1_0/host/AndroidTest.xml
index b8772e1..b5a47e1 100644
--- a/vibrator/V1_0/host/AndroidTest.xml
+++ b/vibrator/V1_0/host/AndroidTest.xml
@@ -28,6 +28,6 @@
         <option name="test-module-name" value="VtsHalVibratorV1_0Host"/>
         <option name="test-case-path" value="vts/testcases/hal/vibrator/V1_0/host/VtsHalVibratorV1_0HostTest"/>
         <option name="precondition-lshal" value="android.hardware.vibrator@1.0"/>
-        <option name="test-timeout" value="1m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/vibrator/V1_0/host_profiling/AndroidTest.xml b/vibrator/V1_0/host_profiling/AndroidTest.xml
index 01c20af..a8cdfe6 100644
--- a/vibrator/V1_0/host_profiling/AndroidTest.xml
+++ b/vibrator/V1_0/host_profiling/AndroidTest.xml
@@ -31,6 +31,6 @@
         <option name="test-case-path" value="vts/testcases/hal/vibrator/V1_0/host/VtsHalVibratorV1_0HostTest"/>
         <option name="enable-profiling" value="true"/>
         <option name="precondition-lshal" value="android.hardware.vibrator@1.0"/>
-        <option name="test-timeout" value="1m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/vibrator/V1_0/target/AndroidTest.xml b/vibrator/V1_0/target/AndroidTest.xml
index 7d0e632..b67333a 100644
--- a/vibrator/V1_0/target/AndroidTest.xml
+++ b/vibrator/V1_0/target/AndroidTest.xml
@@ -27,6 +27,6 @@
         <option name="binary-test-disable-framework" value="true"/>
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="precondition-lshal" value="android.hardware.vibrator@1.0"/>
-        <option name="test-timeout" value="1m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/vibrator/V1_0/target_profiling/AndroidTest.xml b/vibrator/V1_0/target_profiling/AndroidTest.xml
index 32e7b61..3e6bfdc 100644
--- a/vibrator/V1_0/target_profiling/AndroidTest.xml
+++ b/vibrator/V1_0/target_profiling/AndroidTest.xml
@@ -31,6 +31,6 @@
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="enable-profiling" value="true"/>
         <option name="precondition-lshal" value="android.hardware.vibrator@1.0"/>
-        <option name="test-timeout" value="1m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/vibrator/V1_0/target_replay/AndroidTest.xml b/vibrator/V1_0/target_replay/AndroidTest.xml
index 5c46655..4db646b 100644
--- a/vibrator/V1_0/target_replay/AndroidTest.xml
+++ b/vibrator/V1_0/target_replay/AndroidTest.xml
@@ -28,6 +28,6 @@
         <option name="binary-test-type" value="hal_hidl_replay_test" />
         <option name="hal-hidl-replay-test-trace-path" value="test/vts-testcase/hal-trace/vibrator/V1_0/android.hardware.vibrator@1.0_sailfish_1.vts.trace" />
         <option name="hal-hidl-package-name" value="android.hardware.vibrator@1.0" />
-        <option name="test-timeout" value="2m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/vr/V1_0/host/AndroidTest.xml b/vr/V1_0/host/AndroidTest.xml
index 79aebd8..456a877 100644
--- a/vr/V1_0/host/AndroidTest.xml
+++ b/vr/V1_0/host/AndroidTest.xml
@@ -27,6 +27,6 @@
         <option name="test-module-name" value="VtsHalVrV1_0Host"/>
         <option name="test-case-path" value="vts/testcases/hal/vr/V1_0/host/VtsHalVrV1_0HostTest"/>
         <option name="precondition-lshal" value="android.hardware.vr@1.0"/>
-        <option name="test-timeout" value="1m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/vr/V1_0/target/AndroidTest.xml b/vr/V1_0/target/AndroidTest.xml
index 98cc610..51574f3 100644
--- a/vr/V1_0/target/AndroidTest.xml
+++ b/vr/V1_0/target/AndroidTest.xml
@@ -32,6 +32,6 @@
         <option name="precondition-feature" value="android.hardware.vr.high_performance" />
         <option name="precondition-lshal" value="android.hardware.vr@1.0"/>
         <option name="test-config-path" value="vts/testcases/hal/vr/V1_0/target/VrHidlTargetTest.config" />
-        <option name="test-timeout" value="1m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/vr/V1_0/target_profiling/AndroidTest.xml b/vr/V1_0/target_profiling/AndroidTest.xml
index 11de170..67dcd70 100644
--- a/vr/V1_0/target_profiling/AndroidTest.xml
+++ b/vr/V1_0/target_profiling/AndroidTest.xml
@@ -31,6 +31,6 @@
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="enable-profiling" value="true"/>
         <option name="precondition-lshal" value="android.hardware.vr@1.0"/>
-        <option name="test-timeout" value="1m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/vr/V1_0/target_replay/AndroidTest.xml b/vr/V1_0/target_replay/AndroidTest.xml
index d8fb3cf..a9de929 100644
--- a/vr/V1_0/target_replay/AndroidTest.xml
+++ b/vr/V1_0/target_replay/AndroidTest.xml
@@ -29,6 +29,6 @@
         <option name="hal-hidl-replay-test-trace-path" value="test/vts-testcase/hal-trace/vr/V1_0/android.hardware.vr@1.0_sailfish_1.vts.trace"/>
         <option name="hal-hidl-package-name" value="android.hardware.vr@1.0"/>
         <option name="precondition-lshal" value="android.hardware.vr@1.0"/>
-        <option name="test-timeout" value="1m"/>
+        <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/wifi/V1_0/target/base/AndroidTest.xml b/wifi/V1_0/target/base/AndroidTest.xml
index 86fd502..76c0895 100644
--- a/wifi/V1_0/target/base/AndroidTest.xml
+++ b/wifi/V1_0/target/base/AndroidTest.xml
@@ -27,6 +27,6 @@
         <option name="binary-test-disable-framework" value="true"/>
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="precondition-lshal" value="android.hardware.wifi@1.0"/>
-        <option name="test-timeout" value="10m"/>
+        <option name="test-timeout" value="15m"/>
     </test>
 </configuration>
diff --git a/wifi/V1_0/target/nan/AndroidTest.xml b/wifi/V1_0/target/nan/AndroidTest.xml
index d06e877..518e8b7 100644
--- a/wifi/V1_0/target/nan/AndroidTest.xml
+++ b/wifi/V1_0/target/nan/AndroidTest.xml
@@ -25,6 +25,6 @@
         <option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalWifiNanV1_0TargetTest/VtsHalWifiNanV1_0TargetTest" />
         <option name="binary-test-type" value="hal_hidl_gtest"/>
         <option name="precondition-feature" value="android.hardware.wifi.aware" />
-        <option name="test-timeout" value="10m"/>
+        <option name="test-timeout" value="15m"/>
     </test>
 </configuration>
diff --git a/wifi/V1_0/target_profiling/base/AndroidTest.xml b/wifi/V1_0/target_profiling/base/AndroidTest.xml
index ff359a4..4ae9f18 100644
--- a/wifi/V1_0/target_profiling/base/AndroidTest.xml
+++ b/wifi/V1_0/target_profiling/base/AndroidTest.xml
@@ -31,6 +31,6 @@
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="enable-profiling" value="true"/>
         <option name="precondition-lshal" value="android.hardware.wifi@1.0"/>
-        <option name="test-timeout" value="10m"/>
+        <option name="test-timeout" value="15m"/>
     </test>
 </configuration>
diff --git a/wifi/V1_0/target_profiling/nan/AndroidTest.xml b/wifi/V1_0/target_profiling/nan/AndroidTest.xml
index 4c6b070..bd6353a 100644
--- a/wifi/V1_0/target_profiling/nan/AndroidTest.xml
+++ b/wifi/V1_0/target_profiling/nan/AndroidTest.xml
@@ -29,6 +29,6 @@
         <option name="binary-test-type" value="hal_hidl_gtest"/>
         <option name="enable-profiling" value="true"/>
         <option name="precondition-feature" value="android.hardware.wifi.aware" />
-        <option name="test-timeout" value="10m"/>
+        <option name="test-timeout" value="15m"/>
     </test>
 </configuration>
diff --git a/wifi/supplicant/V1_0/target_profiling/AndroidTest.xml b/wifi/supplicant/V1_0/target_profiling/AndroidTest.xml
index d63f3a2..59183ce 100644
--- a/wifi/supplicant/V1_0/target_profiling/AndroidTest.xml
+++ b/wifi/supplicant/V1_0/target_profiling/AndroidTest.xml
@@ -31,6 +31,6 @@
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="enable-profiling" value="true"/>
         <option name="precondition-lshal" value="android.hardware.wifi.supplicant@1.0"/>
-        <option name="test-timeout" value="20m"/>
+        <option name="test-timeout" value="30m"/>
     </test>
 </configuration>