diff --git a/server/cros/tradefed/generate_controlfiles_GTS.py b/server/cros/tradefed/generate_controlfiles_GTS.py
index bf185c7..27fed8a 100755
--- a/server/cros/tradefed/generate_controlfiles_GTS.py
+++ b/server/cros/tradefed/generate_controlfiles_GTS.py
@@ -55,8 +55,8 @@
         'GtsNetworkWatchlistTestCases': 1.0,
         'GtsYouTubeTestCases': 1.0,
         _ALL: 24,
-        _COLLECT: 0.5,
-        _PUBLIC_COLLECT: 0.5,
+        _COLLECT: 1.0,
+        _PUBLIC_COLLECT: 1.0,
 }
 
 # Any test that runs as part as blocking BVT needs to be stable and fast. For
diff --git a/server/site_tests/cheets_GTS/control.8.0_r2.tradefed-run-collect-tests-only-internal b/server/site_tests/cheets_GTS/control.8.0_r2.tradefed-run-collect-tests-only-internal
index 866312b..f5b0129 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r2.tradefed-run-collect-tests-only-internal
+++ b/server/site_tests/cheets_GTS/control.8.0_r2.tradefed-run-collect-tests-only-internal
@@ -30,6 +30,6 @@
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R2-P-6955212.zip',
         use_jdk9=True,
-        timeout=1800)
+        timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.tradefed-run-collect-tests-only b/server/site_tests/cheets_GTS/control.tradefed-run-collect-tests-only
index bf3fbf0..3cfa012 100644
--- a/server/site_tests/cheets_GTS/control.tradefed-run-collect-tests-only
+++ b/server/site_tests/cheets_GTS/control.tradefed-run-collect-tests-only
@@ -31,6 +31,6 @@
         retry_manual_tests=True,
         use_jdk9=True,
         warn_on_test_retry=False,
-        timeout=1800)
+        timeout=3600)
 
 parallel_simple(run_TS, machines)