diff --git a/all.gyp b/all.gyp
index 1800bfd6d..8cf409022 100644
--- a/all.gyp
+++ b/all.gyp
@@ -659,7 +659,6 @@
                 '../chrome/chrome.gyp:crash_service',
                 '../chrome/chrome.gyp:performance_ui_tests',
                 '../chrome/chrome.gyp:policy_templates',
-                '../chrome/chrome.gyp:pyautolib',
                 '../chrome/chrome.gyp:reliability_tests',
                 '../chrome/chrome.gyp:automated_ui_tests',
                 '../chrome/installer/mini_installer.gyp:mini_installer',
@@ -670,6 +669,13 @@
                 '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter',
               ],
               'conditions': [
+                # If you change this condition, make sure you also change it
+                # in chrome_tests.gypi
+                ['enable_automation==1 and (OS=="mac" or ((OS=="win" or os_posix==1) and target_arch==python_arch))', {
+                  'dependencies': [
+                    '../chrome/chrome.gyp:pyautolib',
+                  ],
+                }],
                 ['internal_pdf', {
                   'dependencies': [
                     '../pdf/pdf.gyp:pdf',