diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index e8d3feeec..026084e00 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -5,13 +5,13 @@ buildifier:
 platforms:
   ubuntu1604:
     test_targets:
-    - "//:tests"
+    - "//..."
   ubuntu1804:
     test_targets:
-    - "//:tests"
+    - "//..."
   macos:
     test_targets:
-    - "//:tests"
+    - "//..."
   windows:
     test_flags:
     - "--enable_runfiles"
diff --git a/launcher.js b/launcher.js
index 090cb1750..2dc0d6097 100644
--- a/launcher.js
+++ b/launcher.js
@@ -22,6 +22,7 @@ const spawn = require('child_process').spawn;
 
 function getNativeBinary() {
   const arch = {
+    'arm64' : 'arm64',
     'x64' : 'amd64',
   }[os.arch()];
   // Filter the platform based on the platforms that are build/included.
@@ -36,7 +37,7 @@ function getNativeBinary() {
     'win32' : '.exe',
   }[os.platform()];
 
-  if (arch == undefined || platform == undefined) {
+  if (arch == undefined || platform == undefined || (arch == 'arm64' && platform == 'windows')) {
     console.error(`FATAL: Your platform/architecture combination ${
         os.platform()} - ${os.arch()} is not yet supported.
     See instructions at https://github.com/bazelbuild/buildtools/blob/master/_TOOL_/README.md.`);