diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0838f6669..22ccfe32f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -47,6 +47,8 @@ jobs:
       matrix:
         os:
         - ubuntu-latest
+        - macos-latest
+        - windows-latest
         node:
         - 14
 
diff --git a/package.json b/package.json
index e32d109e4..4dd718d56 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
     "lint:md": "remark -f doc CONTRIBUTING.md README.md packages/*/README.md examples/*/README.md packages/lint/doc",
     "release": "next release --default-branch main --scripts.precommit \"FALTEST_PRINT_VERSION=false yargs-help-output README.md --npm-script-name start && git add README.md\" --scripts.postbump \"\\\"$PWD/scripts/postbump.js\\\"\" --no-bump-in-range-dependencies",
     "start": "faltest",
-    "test": "./scripts/run.js packages test",
+    "test": "node scripts/run.js packages test",
     "test:acceptance": "mocha"
   },
   "repository": {
diff --git a/packages/cli/test/acceptance/kill-orphans-test.js b/packages/cli/test/acceptance/kill-orphans-test.js
index f8dbe8fc6..323f73081 100644
--- a/packages/cli/test/acceptance/kill-orphans-test.js
+++ b/packages/cli/test/acceptance/kill-orphans-test.js
@@ -8,6 +8,8 @@ const exec = promisify(require('child_process').exec);
 const { startWebDriver } = require('../../../remote/src');
 
 describe(function() {
+  this.timeout(10e3);
+
   it('works', async function() {
     let webDriver = await startWebDriver({
       overrides: {
diff --git a/packages/cli/test/fixtures/bin.js b/packages/cli/test/fixtures/bin.js
index 73020e9fa..6055bf622 100644
--- a/packages/cli/test/fixtures/bin.js
+++ b/packages/cli/test/fixtures/bin.js
@@ -2,4 +2,10 @@
 
 process.env.FALTEST_CONFIG_DIR = __dirname;
 
-require('../../../../node_modules/.bin/faltest');
+let bin = 'faltest';
+
+if (process.platform === 'win32') {
+  bin += '.cmd';
+}
+
+require(`../../../../node_modules/.bin/${bin}`);