diff --git a/all.gyp b/all.gyp
index 005f57577..5abaff138 100644
--- a/all.gyp
+++ b/all.gyp
@@ -265,15 +265,9 @@
       'type': 'none',
       'dependencies': [
         'chromium_builder_qa', # needed for pyauto
-        '../chrome/chrome.gyp:memory_test',
-        '../chrome/chrome.gyp:page_cycler_tests',
         '../chrome/chrome.gyp:performance_ui_tests',
         '../chrome/chrome.gyp:plugin_tests',
-        '../chrome/chrome.gyp:startup_tests',
         '../chrome/chrome.gyp:sync_performance_tests',
-        '../chrome/chrome.gyp:tab_switching_test',
-        '../chrome/chrome.gyp:ui_tests', # needed for dromaeo, sunspider, v8
-        '../chrome/chrome.gyp:url_fetch_test',
       ],
     }, # target_name: chromium_builder_perf
     {
@@ -345,19 +339,15 @@
           'type': 'none',
           'dependencies': [
             '../chrome/chrome.gyp:browser_tests',
-            '../chrome/chrome.gyp:memory_test',
+            '../chrome/chrome.gyp:performance_ui_tests',
             '../chrome/chrome.gyp:nacl_ui_tests',
             '../chrome/chrome.gyp:nacl_sandbox_tests',
-            '../chrome/chrome.gyp:page_cycler_tests',
             '../chrome/chrome.gyp:plugin_tests',
             '../chrome/chrome.gyp:safe_browsing_tests',
-            '../chrome/chrome.gyp:startup_tests',
             '../chrome/chrome.gyp:sync_integration_tests',
             '../chrome/chrome.gyp:sync_unit_tests',
-            '../chrome/chrome.gyp:tab_switching_test',
             '../chrome/chrome.gyp:ui_tests',
             '../chrome/chrome.gyp:unit_tests',
-            '../chrome/chrome.gyp:url_fetch_test',
             '../ui/ui.gyp:gfx_unittests',
             '../gpu/gpu.gyp:gpu_unittests',
             '../ipc/ipc.gyp:ipc_tests',
@@ -424,22 +414,17 @@
             '../chrome/chrome.gyp:browser_tests',
             '../chrome/chrome.gyp:installer_util_unittests',
             '../chrome/chrome.gyp:interactive_ui_tests',
-            '../chrome/chrome.gyp:memory_test',
             '../chrome/chrome.gyp:mini_installer_test',
             '../chrome/chrome.gyp:nacl_ui_tests',
             '../chrome/chrome.gyp:nacl_sandbox_tests',
-            '../chrome/chrome.gyp:page_cycler_tests',
             '../chrome/chrome.gyp:performance_ui_tests',
             '../chrome/chrome.gyp:plugin_tests',
             '../chrome/chrome.gyp:safe_browsing_tests',
             '../chrome/chrome.gyp:selenium_tests',
-            '../chrome/chrome.gyp:startup_tests',
             '../chrome/chrome.gyp:sync_integration_tests',
             '../chrome/chrome.gyp:sync_unit_tests',
-            '../chrome/chrome.gyp:tab_switching_test',
             '../chrome/chrome.gyp:ui_tests',
             '../chrome/chrome.gyp:unit_tests',
-            '../chrome/chrome.gyp:url_fetch_test',
             # mini_installer_tests depends on mini_installer. This should be
             # defined in installer.gyp.
             '../chrome/installer/mini_installer.gyp:mini_installer',
@@ -557,16 +542,12 @@
             '../chrome/chrome.gyp:browser_tests',
             '../chrome/chrome.gyp:chrome',
             '../chrome/chrome.gyp:interactive_ui_tests',
-            '../chrome/chrome.gyp:memory_test',
-            '../chrome/chrome.gyp:page_cycler_tests',
+            '../chrome/chrome.gyp:performance_ui_tests',
             '../chrome/chrome.gyp:safe_browsing_tests',
-            '../chrome/chrome.gyp:startup_tests',
             '../chrome/chrome.gyp:sync_unit_tests',
             '../chrome/chrome.gyp:sync_integration_tests',
-            '../chrome/chrome.gyp:tab_switching_test',
             '../chrome/chrome.gyp:ui_tests',
             '../chrome/chrome.gyp:unit_tests',
-            '../chrome/chrome.gyp:url_fetch_test',
             '../crypto/crypto.gyp:crypto_unittests',
             '../ui/ui.gyp:gfx_unittests',
             '../ipc/ipc.gyp:ipc_tests',