diff --git a/client/site_tests/graphics_dEQP/control.gles2.stress b/client/site_tests/graphics_dEQP/control.gles2.stress
deleted file mode 100644
index 2a81015..0000000
--- a/client/site_tests/graphics_dEQP/control.gles2.stress
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2015 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.
-
-# Please do not edit this file! It has been created by generate_controlfiles.py.
-
-NAME = 'graphics_dEQP.gles2.stress'
-AUTHOR = 'chromeos-gfx'
-PURPOSE = 'Run the drawElements Quality Program test suite.'
-CRITERIA = 'All of the individual tests must pass.'
-ATTRIBUTES = 'suite:deqp, suite:graphics_per-day, suite:graphics_system'
-TIME = 'LONG'
-TEST_CATEGORY = 'Functional'
-TEST_CLASS = 'graphics'
-TEST_TYPE = 'client'
-MAX_RESULT_SIZE_KB = 131072
-DOC = """
-This test runs the drawElements Quality Program test suite.
-"""
-job.run_test('graphics_dEQP',
-             tag = 'stress',
-             opts = args + [
-                 'filter=dEQP-GLES2.stress',
-                 'subset_to_run=Pass',
-                 'hasty=False',
-                 'shard_number=0',
-                 'shard_count=1'
-             ])
\ No newline at end of file
diff --git a/client/site_tests/graphics_dEQP/control.gles3.stress b/client/site_tests/graphics_dEQP/control.gles3.stress
deleted file mode 100644
index 2929a6a..0000000
--- a/client/site_tests/graphics_dEQP/control.gles3.stress
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2015 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.
-
-# Please do not edit this file! It has been created by generate_controlfiles.py.
-
-NAME = 'graphics_dEQP.gles3.stress'
-AUTHOR = 'chromeos-gfx'
-PURPOSE = 'Run the drawElements Quality Program test suite.'
-CRITERIA = 'All of the individual tests must pass.'
-ATTRIBUTES = ''
-TIME = 'LONG'
-TEST_CATEGORY = 'Functional'
-TEST_CLASS = 'graphics'
-TEST_TYPE = 'client'
-MAX_RESULT_SIZE_KB = 131072
-DOC = """
-This test runs the drawElements Quality Program test suite.
-"""
-job.run_test('graphics_dEQP',
-             opts = args + [
-                 'filter=dEQP-GLES3.stress',
-                 'subset_to_run=Pass',
-                 'hasty=False',
-                 'shard_number=0',
-                 'shard_count=1'
-             ])
\ No newline at end of file
diff --git a/client/site_tests/graphics_dEQP/control.gles31.stress b/client/site_tests/graphics_dEQP/control.gles31.stress
deleted file mode 100644
index 11b60f5..0000000
--- a/client/site_tests/graphics_dEQP/control.gles31.stress
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2015 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.
-
-# Please do not edit this file! It has been created by generate_controlfiles.py.
-
-NAME = 'graphics_dEQP.gles31.stress'
-AUTHOR = 'chromeos-gfx'
-PURPOSE = 'Run the drawElements Quality Program test suite.'
-CRITERIA = 'All of the individual tests must pass.'
-ATTRIBUTES = 'suite:deqp, suite:graphics_per-day, suite:graphics_system'
-TIME = 'LONG'
-TEST_CATEGORY = 'Functional'
-TEST_CLASS = 'graphics'
-TEST_TYPE = 'client'
-MAX_RESULT_SIZE_KB = 131072
-DOC = """
-This test runs the drawElements Quality Program test suite.
-"""
-job.run_test('graphics_dEQP',
-             tag = 'stress',
-             opts = args + [
-                 'filter=dEQP-GLES31.stress',
-                 'subset_to_run=Pass',
-                 'hasty=False',
-                 'shard_number=0',
-                 'shard_count=1'
-             ])
\ No newline at end of file
diff --git a/client/site_tests/graphics_dEQP/generate_controlfiles.py b/client/site_tests/graphics_dEQP/generate_controlfiles.py
index 2e06faa..cc319ef 100644
--- a/client/site_tests/graphics_dEQP/generate_controlfiles.py
+++ b/client/site_tests/graphics_dEQP/generate_controlfiles.py
@@ -50,16 +50,13 @@
     # The stress, accuracy and performance tests are not part of -master lists.
     # Hence we create control files in case we want to run them. But there is
     # no strict requirement to keep them passing.
-    Test('dEQP-GLES2.stress',      Suite.daily, shards=1,  hasty=False, time='LONG',     tag='stress',        test_file=None,               perf_failure_description=None),
     Test('dEQP-GLES3.accuracy',    Suite.none,  shards=1,  hasty=False, time='FAST',     tag=None,            test_file=None,               perf_failure_description=None),
     Test('dEQP-GLES3-master',      Suite.daily, shards=1,  hasty=False, time='LENGTHY',  tag='gles3-master',  test_file=GLES3_MASTER_FILE,  perf_failure_description='Failures_GLES3'),
     #Test('dEQP-GLES3-master',      Suite.bvtpb, shards=10, hasty=True,  time='FAST',     tag='gles3-master',  test_file=GLES3_MASTER_FILE,  perf_failure_description=None),
     Test('dEQP-GLES3.performance', Suite.none,  shards=1,  hasty=False, time='LONG',     tag=None,            test_file=None,               perf_failure_description=None),
     # It is not worth running GLES3.stress in addition to GLES2.stress and GLES31.stress just to find stability issues.
-    Test('dEQP-GLES3.stress',      Suite.none,  shards=1,  hasty=False, time='LONG',     tag=None,            test_file=None,               perf_failure_description=None),
     Test('dEQP-GLES31-master',     Suite.daily, shards=1,  hasty=False, time='LENGTHY',  tag='gles31-master', test_file=GLES31_MASTER_FILE, perf_failure_description='Failures_GLES31'),
     #Test('dEQP-GLES31-master',     Suite.bvtpb, shards=10, hasty=True,  time='FAST',     tag='gles31-master', test_file=GLES31_MASTER_FILE, perf_failure_description=None),
-    Test('dEQP-GLES31.stress',     Suite.daily, shards=1,  hasty=False, time='LONG',     tag='stress',        test_file=None,               perf_failure_description=None),
     Test('dEQP-VK-master',         Suite.daily, shards=1,  hasty=True,  time='LENGTHY',  tag='vk-master',     test_file=VK_MASTER_FILE,     perf_failure_description='Failures_VK'),
 ]