diff --git a/build/commands/lib/build.js b/build/commands/lib/build.js
index 9b938a2fa25..38e2043e723 100644
--- a/build/commands/lib/build.js
+++ b/build/commands/lib/build.js
@@ -132,6 +132,7 @@ const build = (buildConfig = config.defaultBuildConfig, options) => {
   if (config.xcode_gen_target) {
     util.generateXcodeWorkspace()
   } else {
+    util.generateNinjaFiles()
     util.buildTarget()
   }
 }
diff --git a/build/commands/lib/createDist.js b/build/commands/lib/createDist.js
index ad15a6121a0..08c1288d9e0 100644
--- a/build/commands/lib/createDist.js
+++ b/build/commands/lib/createDist.js
@@ -26,6 +26,7 @@ const createDist = (buildConfig = config.defaultBuildConfig, options) => {
     }
   }
   config.buildTarget = 'create_dist'
+  util.generateNinjaFiles()
   util.buildTarget()
 }
 
diff --git a/build/commands/lib/test.js b/build/commands/lib/test.js
index 1b30f1b1d33..f2e9501dc6b 100644
--- a/build/commands/lib/test.js
+++ b/build/commands/lib/test.js
@@ -70,10 +70,11 @@ const test = (passthroughArgs, suite, buildConfig = config.defaultBuildConfig, o
     'brave_network_audit_tests',
   ]
   if (testSuites.includes(suite)) {
-    util.run('ninja', ['-C', config.outputDir, "brave/test:" + suite], config.defaultOptions)
+    config.buildTarget = 'brave/test:' + suite
   } else {
-    util.run('ninja', ['-C', config.outputDir, suite], config.defaultOptions)
+    config.buildTarget = suite
   }
+  util.buildTarget()
 
   if (config.targetOS === 'ios') {
     util.run(path.join(config.outputDir, "iossim"), [
diff --git a/build/commands/lib/util.js b/build/commands/lib/util.js
index e6d9bd4c22c..8e94b597ac0 100755
--- a/build/commands/lib/util.js
+++ b/build/commands/lib/util.js
@@ -559,14 +559,18 @@ const util = {
     }
   },
 
-  buildTarget: (options = config.defaultOptions) => {
-    console.log('building ' + config.buildTarget + '...')
+  generateNinjaFiles: (options = config.defaultOptions) => {
+    console.log('generating ninja files...')
 
     if (process.platform === 'win32') {
       util.updateOmahaMidlFiles()
       util.buildRedirectCCTool()
     }
     util.runGnGen(options)
+  },
+
+  buildTarget: (options = config.defaultOptions) => {
+    console.log('building ' + config.buildTarget + '...')
 
     let num_compile_failure = 1
     if (config.ignore_compile_failure)
diff --git a/build/commands/scripts/audit.js b/build/commands/scripts/audit.js
index 8e836aa68b7..f52bf41d0b9 100644
--- a/build/commands/scripts/audit.js
+++ b/build/commands/scripts/audit.js
@@ -20,4 +20,4 @@ let ninjaOpts = [
   '-C', outputDir, 'brave:audit_deps',
   ...config.extraNinjaOpts
 ]
-util.run('ninja', ninjaOpts, options)
+util.run('autoninja', ninjaOpts, options)
diff --git a/build/commands/scripts/commands.js b/build/commands/scripts/commands.js
index 8d2162bea8a..bdbc216436b 100755
--- a/build/commands/scripts/commands.js
+++ b/build/commands/scripts/commands.js
@@ -236,6 +236,7 @@ program
   .option('--target_arch <target_arch>', 'target architecture')
   .option('--run_disabled_tests', 'run disabled tests')
   .option('--manual_android_test_device', 'indicates that Android test device is run manually')
+  .option('--use_goma', 'whether to use Goma for building')
   .arguments('[build_config]')
   .action(test.bind(null, parsedArgs.unknown))