diff --git a/server/site_tests/cheets_GTS/cheets_GTS.py b/server/site_tests/cheets_GTS/cheets_GTS.py
index 51cef1c..ecfe6de 100644
--- a/server/site_tests/cheets_GTS/cheets_GTS.py
+++ b/server/site_tests/cheets_GTS/cheets_GTS.py
@@ -23,7 +23,7 @@
 # Maximum default time allowed for each individual GTS module.
 _GTS_TIMEOUT_SECONDS = 3600
 _PARTNER_GTS_BUCKET = 'gs://chromeos-partner-gts/'
-_PARTNER_GTS_LOCATION = _PARTNER_GTS_BUCKET + 'gts-7_r4-6219464.zip'
+_PARTNER_GTS_LOCATION = _PARTNER_GTS_BUCKET + 'gts-7_r5-6497315.zip'
 _PARTNER_GTS_AUTHKEY = _PARTNER_GTS_BUCKET + 'gts-arc.json'
 _GTS_MEDIA_URI = ('https://storage.googleapis.com/youtube-test-media/gts/' +
                   'GtsYouTubeTestCases-media-1.2.zip')
diff --git a/server/site_tests/cheets_GTS/control.GtsLauncherHostTestCases b/server/site_tests/cheets_GTS/control.GtsLauncherHostTestCases
deleted file mode 100644
index 7161f4c..0000000
--- a/server/site_tests/cheets_GTS/control.GtsLauncherHostTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsLauncherHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsLauncherHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsLauncherHostTestCases',
-        test_name='cheets_GTS.GtsLauncherHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsLauncherHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsLauncherHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsSecurityTestCases b/server/site_tests/cheets_GTS/control.GtsSecurityTestCases
deleted file mode 100644
index bc6ebfd..0000000
--- a/server/site_tests/cheets_GTS/control.GtsSecurityTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsSecurityTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSecurityTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsSecurityTestCases',
-        test_name='cheets_GTS.GtsSecurityTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSecurityTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSecurityTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.ReviewPermissionHelperGts b/server/site_tests/cheets_GTS/control.ReviewPermissionHelperGts
deleted file mode 100644
index 6d51177..0000000
--- a/server/site_tests/cheets_GTS/control.ReviewPermissionHelperGts
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.ReviewPermissionHelperGts'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module ReviewPermissionHelperGts of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='ReviewPermissionHelperGts',
-        test_name='cheets_GTS.ReviewPermissionHelperGts',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'ReviewPermissionHelperGts', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='ReviewPermissionHelperGts',
-        target_plan=None,
-        retry_manual_tests=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)