diff --git a/client.mk b/client.mk
index b0ace5d200b0..eb029435c671 100644
--- a/client.mk
+++ b/client.mk
@@ -61,9 +61,7 @@ endif
 ### Build it
 build::
 	+$(MOZ_MAKE) $(SCCACHE_STOP_ON_FAILURE)
-
 ifdef MOZ_AUTOMATION
-build::
 	+$(MOZ_MAKE) automation/build $(SCCACHE_STOP_ON_FAILURE)
 endif
 
diff --git a/python/mozbuild/mozbuild/build_commands.py b/python/mozbuild/mozbuild/build_commands.py
index fa3c7e334f8a..bd35a1660e5a 100644
--- a/python/mozbuild/mozbuild/build_commands.py
+++ b/python/mozbuild/mozbuild/build_commands.py
@@ -160,6 +160,9 @@ def build(
     doing_pgo = configure_args and "MOZ_PGO=1" in configure_args
     # Force verbosity on automation.
     verbose = verbose or bool(os.environ.get("MOZ_AUTOMATION", False))
+    # Keep going by default on automation so that we exhaust as many errors as
+    # possible.
+    keep_going = keep_going or bool(os.environ.get("MOZ_AUTOMATION", False))
     append_env = None
 
     # By setting the current process's priority, by default our child processes