diff --git a/.watchmanconfig b/.watchmanconfig
index 0967ef424..c94bdec8a 100644
--- a/.watchmanconfig
+++ b/.watchmanconfig
@@ -1 +1,3 @@
-{}
+{
+  "ignore_dirs": ["node_modules", "build", "dist"]
+}
diff --git a/scripts/yarn-install.js b/scripts/yarn-install.js
index 027598077..acf80a05a 100644
--- a/scripts/yarn-install.js
+++ b/scripts/yarn-install.js
@@ -12,6 +12,7 @@ const util = require('util');
 const glob = util.promisify(require('glob'));
 const exec = util.promisify(require('child_process').exec);
 const PACKAGES = [
+  'headless-tests',
   'static',
   'src/plugins/*',
   'src/fb/plugins/*',
diff --git a/src/dispatcher/__tests__/TestPlugin.js b/src/dispatcher/__tests__/TestPlugin.js
index 6553a6362..eaa21f5a5 100644
--- a/src/dispatcher/__tests__/TestPlugin.js
+++ b/src/dispatcher/__tests__/TestPlugin.js
@@ -12,3 +12,8 @@ import {FlipperPlugin} from 'flipper';
 export default class extends FlipperPlugin {
   static id = 'Static ID';
 }
+
+test('TestPlugin', () => {
+  // supress jest warning
+  expect(true).toBeTruthy();
+});
diff --git a/src/server.tsx b/src/server.tsx
index 39e9238c3..f4f640028 100644
--- a/src/server.tsx
+++ b/src/server.tsx
@@ -32,7 +32,10 @@ import JSDevice from './devices/JSDevice';
 import {WebsocketClientFlipperConnection} from './utils/js-client/websocketClientFlipperConnection';
 import querystring from 'querystring';
 import {IncomingMessage} from 'http';
-const ws = window.require('ws'); // Electron tries to get you to use browser's ws instead, so can't use import.
+import {isTest} from './utils/isProduction';
+// Electron tries to get you to use browser's ws instead, so can't use import.
+// @ts-ignore
+const ws = isTest() ? require('ws') : window.require('ws');
 
 type ClientInfo = {
   connection: FlipperClientConnection<any, any> | null | undefined;
diff --git a/src/utils/isProduction.tsx b/src/utils/isProduction.tsx
index bff5a7013..46aed04b7 100644
--- a/src/utils/isProduction.tsx
+++ b/src/utils/isProduction.tsx
@@ -13,6 +13,12 @@ const _isProduction = !/node_modules[\\/]electron[\\/]/.test(
   process.execPath || electron.remote.process.execPath,
 );
 
+const _isTest = !!process.env.JEST_WORKER_ID;
+
 export default function isProduction(): boolean {
   return _isProduction;
 }
+
+export function isTest(): boolean {
+  return _isTest;
+}
diff --git a/static/globalTestSetup.js b/static/globalTestSetup.js
index 27144d80a..b01cb6659 100644
--- a/static/globalTestSetup.js
+++ b/static/globalTestSetup.js
@@ -7,13 +7,4 @@
  * @format
  */
 
-const defaultConsoleError = console.error;
-
-console.error = function(...args) {
-  defaultConsoleError(
-    'console.error used in a test. This will be an error in the near future.',
-  );
-  defaultConsoleError(...args);
-};
-
 global.fetch = require('jest-fetch-mock');