diff --git a/desktop/app/src/electron/initializeElectron.tsx b/desktop/app/src/electron/initializeElectron.tsx
index 1d3e9d3c7..d8ba1cb45 100644
--- a/desktop/app/src/electron/initializeElectron.tsx
+++ b/desktop/app/src/electron/initializeElectron.tsx
@@ -22,18 +22,10 @@ import {
   clipboard,
   shell,
 } from 'electron';
-import type {RenderHost} from 'flipper-ui-core';
 import fs from 'fs';
 import {setupMenuBar} from './setupMenuBar';
 import {FlipperServer, FlipperServerConfig} from 'flipper-common';
-
-declare global {
-  interface Window {
-    // We store this as a global, to make sure the renderHost is available
-    // before flipper-ui-core is loaded and needs those during module initialisation
-    FlipperRenderHostInstance: RenderHost;
-  }
-}
+import type {RenderHost} from 'flipper-ui-core';
 
 export function initializeElectron(
   flipperServer: FlipperServer,
@@ -185,7 +177,7 @@ export function initializeElectron(
       return flipperServerConfig.gatekeepers[gatekeeper] ?? false;
     },
     flipperServer,
-  };
+  } as RenderHost;
 
   setupMenuBar();
 }
diff --git a/desktop/flipper-plugin/src/test-utils/test-utils.tsx b/desktop/flipper-plugin/src/test-utils/test-utils.tsx
index d9ed57f29..83fbfa6a0 100644
--- a/desktop/flipper-plugin/src/test-utils/test-utils.tsx
+++ b/desktop/flipper-plugin/src/test-utils/test-utils.tsx
@@ -596,13 +596,14 @@ export function createFlipperServerMock(
     exec: jest
       .fn()
       .mockImplementation(
-        (cmd: keyof FlipperServerCommands, ...args: any[]) => {
+        async (cmd: keyof FlipperServerCommands, ...args: any[]) => {
           if (overrides?.[cmd]) {
             return (overrides[cmd] as any)(...args);
           }
-          return Promise.reject(
-            new Error(`FlipperServerMock exec not implemented: ${cmd}}`),
+          console.warn(
+            `Empty server response stubbed for command '${cmd}', set 'getRenderHostInstance().flipperServer.exec' in your test to override the behavior.`,
           );
+          return undefined;
         },
       ),
     close: jest.fn(),
diff --git a/desktop/flipper-ui-core/src/RenderHost.tsx b/desktop/flipper-ui-core/src/RenderHost.tsx
index 86db85d8b..90ce1cd84 100644
--- a/desktop/flipper-ui-core/src/RenderHost.tsx
+++ b/desktop/flipper-ui-core/src/RenderHost.tsx
@@ -11,12 +11,7 @@ import type {NotificationEvents} from './dispatcher/notifications';
 import type {PluginNotification} from './reducers/notifications';
 import type {NotificationConstructorOptions} from 'electron';
 import {FlipperLib} from 'flipper-plugin';
-import {
-  FlipperServer,
-  FlipperServerConfig,
-  ReleaseChannel,
-  Tristate,
-} from 'flipper-common';
+import {FlipperServer, FlipperServerConfig} from 'flipper-common';
 
 // Events that are emitted from the main.ts ovr the IPC process bridge in Electron
 type MainProcessEvents = {
@@ -101,7 +96,7 @@ export interface RenderHost {
   openLink(url: string): void;
   loadDefaultPlugins(): Record<string, any>;
   GK(gatekeeper: string): boolean;
-  flipperServer?: FlipperServer;
+  flipperServer: FlipperServer;
   serverConfig: FlipperServerConfig;
 }
 
@@ -111,87 +106,3 @@ export function getRenderHostInstance(): RenderHost {
   }
   return window.FlipperRenderHostInstance;
 }
-
-if (process.env.NODE_ENV === 'test') {
-  const {tmpdir} = require('os');
-  const {resolve} = require('path');
-
-  const rootPath = resolve(__dirname, '..', '..');
-  const stubConfig: FlipperServerConfig = {
-    env: {...process.env},
-    gatekeepers: {
-      TEST_PASSING_GK: true,
-      TEST_FAILING_GK: false,
-    },
-    isProduction: false,
-    launcherSettings: {
-      ignoreLocalPin: false,
-      releaseChannel: ReleaseChannel.DEFAULT,
-    },
-    paths: {
-      appPath: rootPath,
-      desktopPath: `/dev/null`,
-      execPath: process.execPath,
-      homePath: `/dev/null`,
-      staticPath: resolve(rootPath, 'static'),
-      tempPath: tmpdir(),
-    },
-    processConfig: {
-      disabledPlugins: new Set(),
-      lastWindowPosition: null,
-      launcherEnabled: false,
-      launcherMsg: null,
-      screenCapturePath: `/dev/null`,
-    },
-    settings: {
-      androidHome: `/dev/null`,
-      darkMode: 'light',
-      enableAndroid: false,
-      enableIOS: false,
-      enablePhysicalIOS: false,
-      enablePrefetching: Tristate.False,
-      idbPath: `/dev/null`,
-      reactNative: {
-        shortcuts: {enabled: false, openDevMenu: '', reload: ''},
-      },
-      showWelcomeAtStartup: false,
-      suppressPluginErrors: false,
-    },
-    validWebSocketOrigins: [],
-  };
-
-  window.FlipperRenderHostInstance = {
-    processId: -1,
-    isProduction: false,
-    readTextFromClipboard() {
-      return '';
-    },
-    writeTextToClipboard() {},
-    async importFile() {
-      return undefined;
-    },
-    async exportFile() {
-      return undefined;
-    },
-    registerShortcut() {
-      return () => undefined;
-    },
-    hasFocus() {
-      return true;
-    },
-    onIpcEvent() {},
-    sendIpcEvent() {},
-    shouldUseDarkColors() {
-      return false;
-    },
-    restartFlipper() {},
-    openLink() {},
-    serverConfig: stubConfig,
-    loadDefaultPlugins() {
-      return {};
-    },
-    GK(gk) {
-      return stubConfig.gatekeepers[gk] ?? false;
-    },
-  };
-}
diff --git a/desktop/flipper-ui-core/src/__tests__/__snapshots__/createMockFlipperWithPlugin.node.tsx.snap b/desktop/flipper-ui-core/src/__tests__/__snapshots__/createMockFlipperWithPlugin.node.tsx.snap
index 1cc7fdeb8..058f4f8ce 100644
--- a/desktop/flipper-ui-core/src/__tests__/__snapshots__/createMockFlipperWithPlugin.node.tsx.snap
+++ b/desktop/flipper-ui-core/src/__tests__/__snapshots__/createMockFlipperWithPlugin.node.tsx.snap
@@ -35,13 +35,6 @@ Object {
       "TestPlugin",
     ],
   },
-  "flipperServer": Object {
-    "close": [MockFunction],
-    "connect": [Function],
-    "exec": [MockFunction],
-    "off": [MockFunction],
-    "on": [MockFunction],
-  },
   "pluginMenuEntries": Array [],
   "selectedAppId": "TestApp#Android#MockAndroidDevice#serial",
   "selectedAppPluginListRevision": 0,
diff --git a/desktop/flipper-ui-core/src/dispatcher/flipperServer.tsx b/desktop/flipper-ui-core/src/dispatcher/flipperServer.tsx
index 97e38b843..5b8427d86 100644
--- a/desktop/flipper-ui-core/src/dispatcher/flipperServer.tsx
+++ b/desktop/flipper-ui-core/src/dispatcher/flipperServer.tsx
@@ -27,11 +27,6 @@ export function connectFlipperServerToStore(
   store: Store,
   logger: Logger,
 ) {
-  store.dispatch({
-    type: 'SET_FLIPPER_SERVER',
-    payload: server,
-  });
-
   server.on('notification', ({type, title, description}) => {
     const text = `[$type] ${title}: ${description}`;
     console.warn(text);
diff --git a/desktop/flipper-ui-core/src/reducers/connections.tsx b/desktop/flipper-ui-core/src/reducers/connections.tsx
index adca1785e..f31598e24 100644
--- a/desktop/flipper-ui-core/src/reducers/connections.tsx
+++ b/desktop/flipper-ui-core/src/reducers/connections.tsx
@@ -12,12 +12,7 @@ import {produce} from 'immer';
 
 import type BaseDevice from '../devices/BaseDevice';
 import type Client from '../Client';
-import type {
-  UninitializedClient,
-  DeviceOS,
-  Logger,
-  FlipperServer,
-} from 'flipper-common';
+import type {UninitializedClient, DeviceOS, Logger} from 'flipper-common';
 import type {Actions} from '.';
 import {WelcomeScreenStaticView} from '../sandy-chrome/WelcomeScreen';
 import {isDevicePluginDefinition} from '../utils/pluginUtils';
@@ -79,7 +74,6 @@ type StateV2 = {
   deepLinkPayload: unknown;
   staticView: StaticView;
   selectedAppPluginListRevision: number;
-  flipperServer: FlipperServer | undefined;
 };
 
 type StateV1 = Omit<StateV2, 'enabledPlugins' | 'enabledDevicePlugins'> & {
@@ -165,10 +159,6 @@ export type Action =
   | {
       type: 'APP_PLUGIN_LIST_CHANGED';
     }
-  | {
-      type: 'SET_FLIPPER_SERVER';
-      payload: FlipperServer;
-    }
   | RegisterPluginAction;
 
 const DEFAULT_PLUGIN = 'DeviceLogs';
@@ -195,18 +185,10 @@ const INITAL_STATE: State = {
   deepLinkPayload: null,
   staticView: WelcomeScreenStaticView,
   selectedAppPluginListRevision: 0,
-  flipperServer: undefined,
 };
 
 export default (state: State = INITAL_STATE, action: Actions): State => {
   switch (action.type) {
-    case 'SET_FLIPPER_SERVER': {
-      return {
-        ...state,
-        flipperServer: action.payload,
-      };
-    }
-
     case 'SET_STATIC_VIEW': {
       const {payload, deepLinkPayload} = action;
       return {
diff --git a/desktop/flipper-ui-core/src/sandy-chrome/appinspect/LaunchEmulator.tsx b/desktop/flipper-ui-core/src/sandy-chrome/appinspect/LaunchEmulator.tsx
index d7522a1a4..6bbdc3007 100644
--- a/desktop/flipper-ui-core/src/sandy-chrome/appinspect/LaunchEmulator.tsx
+++ b/desktop/flipper-ui-core/src/sandy-chrome/appinspect/LaunchEmulator.tsx
@@ -20,6 +20,7 @@ import {useStore} from '../../utils/useStore';
 import {Layout, renderReactRoot, withTrackingScope} from 'flipper-plugin';
 import {Provider} from 'react-redux';
 import {IOSDeviceParams} from 'flipper-common';
+import {getRenderHostInstance} from '../../RenderHost';
 
 const COLD_BOOT = 'cold-boot';
 
@@ -37,7 +38,6 @@ function LaunchEmulatorContainer({onClose}: {onClose: () => void}) {
 
 export const LaunchEmulatorDialog = withTrackingScope(
   function LaunchEmulatorDialog({onClose}: {onClose: () => void}) {
-    const flipperServer = useStore((state) => state.connections.flipperServer);
     const iosEnabled = useStore((state) => state.settingsState.enableIOS);
     const androidEnabled = useStore(
       (state) => state.settingsState.enableAndroid,
@@ -49,8 +49,8 @@ export const LaunchEmulatorDialog = withTrackingScope(
       if (!iosEnabled) {
         return;
       }
-      flipperServer!
-        .exec('ios-get-simulators', false)
+      getRenderHostInstance()
+        .flipperServer.exec('ios-get-simulators', false)
         .then((emulators) => {
           setIosEmulators(
             emulators.filter(
@@ -63,21 +63,21 @@ export const LaunchEmulatorDialog = withTrackingScope(
         .catch((e) => {
           console.warn('Failed to find simulators', e);
         });
-    }, [iosEnabled, flipperServer]);
+    }, [iosEnabled]);
 
     useEffect(() => {
       if (!androidEnabled) {
         return;
       }
-      flipperServer!
-        .exec('android-get-emulators')
+      getRenderHostInstance()
+        .flipperServer.exec('android-get-emulators')
         .then((emulators) => {
           setAndroidEmulators(emulators);
         })
         .catch((e) => {
           console.warn('Failed to find emulators', e);
         });
-    }, [androidEnabled, flipperServer]);
+    }, [androidEnabled]);
 
     const items = [
       ...(androidEmulators.length > 0
@@ -85,8 +85,8 @@ export const LaunchEmulatorDialog = withTrackingScope(
         : []),
       ...androidEmulators.map((name) => {
         const launch = (coldBoot: boolean) => {
-          flipperServer!
-            .exec('android-launch-emulator', name, coldBoot)
+          getRenderHostInstance()
+            .flipperServer.exec('android-launch-emulator', name, coldBoot)
             .then(onClose)
             .catch((e) => {
               console.error('Failed to start emulator: ', e);
@@ -123,8 +123,8 @@ export const LaunchEmulatorDialog = withTrackingScope(
         <Button
           key={device.udid}
           onClick={() =>
-            flipperServer!
-              .exec('ios-launch-simulator', device.udid)
+            getRenderHostInstance()
+              .flipperServer.exec('ios-launch-simulator', device.udid)
               .catch((e) => {
                 console.error('Failed to start simulator: ', e);
                 message.error('Failed to start simulator: ' + e);
diff --git a/desktop/flipper-ui-core/src/sandy-chrome/appinspect/__tests__/LaunchEmulator.spec.tsx b/desktop/flipper-ui-core/src/sandy-chrome/appinspect/__tests__/LaunchEmulator.spec.tsx
index b707103e4..87c836e67 100644
--- a/desktop/flipper-ui-core/src/sandy-chrome/appinspect/__tests__/LaunchEmulator.spec.tsx
+++ b/desktop/flipper-ui-core/src/sandy-chrome/appinspect/__tests__/LaunchEmulator.spec.tsx
@@ -14,18 +14,19 @@ import {createStore} from 'redux';
 import {LaunchEmulatorDialog} from '../LaunchEmulator';
 
 import {createRootReducer} from '../../../reducers';
-import {sleep, TestUtils} from 'flipper-plugin';
+import {sleep} from 'flipper-plugin';
+import {getRenderHostInstance} from '../../../RenderHost';
 
 test('Can render and launch android apps - empty', async () => {
   const store = createStore(createRootReducer());
-  const mockServer = TestUtils.createFlipperServerMock({
-    'ios-get-simulators': () => Promise.resolve([]),
-    'android-get-emulators': () => Promise.resolve([]),
-  });
-  store.dispatch({
-    type: 'SET_FLIPPER_SERVER',
-    payload: mockServer,
-  });
+
+  const responses: any = {
+    'ios-get-simulators': [],
+    'android-get-emulators': [],
+  };
+  getRenderHostInstance().flipperServer.exec = async function (cmd: any) {
+    return responses[cmd];
+  } as any;
   const onClose = jest.fn();
 
   const renderer = render(
@@ -44,21 +45,16 @@ test('Can render and launch android apps - empty', async () => {
 });
 
 test('Can render and launch android apps', async () => {
-  let p: Promise<any> | undefined = undefined;
-
   const store = createStore(createRootReducer());
-  const launch = jest.fn().mockImplementation(() => Promise.resolve());
-  const mockServer = TestUtils.createFlipperServerMock({
-    'ios-get-simulators': () => Promise.resolve([]),
-    'android-get-emulators': () =>
-      (p = Promise.resolve(['emulator1', 'emulator2'])),
-    'android-launch-emulator': launch,
-  });
-  store.dispatch({
-    type: 'SET_FLIPPER_SERVER',
-    payload: mockServer,
+
+  const exec = jest.fn().mockImplementation(async (cmd) => {
+    if (cmd === 'android-get-emulators') {
+      return ['emulator1', 'emulator2'];
+    }
   });
 
+  getRenderHostInstance().flipperServer.exec = exec;
+
   store.dispatch({
     type: 'UPDATE_SETTINGS',
     payload: {
@@ -74,7 +70,7 @@ test('Can render and launch android apps', async () => {
     </Provider>,
   );
 
-  await p!;
+  await sleep(1); // give exec time to resolve
 
   expect(await renderer.findAllByText(/emulator/)).toMatchInlineSnapshot(`
     Array [
@@ -91,5 +87,16 @@ test('Can render and launch android apps', async () => {
   fireEvent.click(renderer.getByText('emulator2'));
   await sleep(1000);
   expect(onClose).toBeCalled();
-  expect(launch).toBeCalledWith('emulator2', false);
+  expect(exec.mock.calls).toMatchInlineSnapshot(`
+    Array [
+      Array [
+        "android-get-emulators",
+      ],
+      Array [
+        "android-launch-emulator",
+        "emulator2",
+        false,
+      ],
+    ]
+  `);
 });
diff --git a/desktop/flipper-ui-core/src/test-utils/MockFlipper.tsx b/desktop/flipper-ui-core/src/test-utils/MockFlipper.tsx
index 3dd2a5188..687715d64 100644
--- a/desktop/flipper-ui-core/src/test-utils/MockFlipper.tsx
+++ b/desktop/flipper-ui-core/src/test-utils/MockFlipper.tsx
@@ -28,7 +28,6 @@ import ArchivedDevice from '../devices/ArchivedDevice';
 import {ClientQuery, DeviceOS} from 'flipper-common';
 import {TestDevice} from './TestDevice';
 import {getRenderHostInstance} from '../RenderHost';
-import {TestUtils} from 'flipper-plugin';
 
 export interface AppOptions {
   plugins?: PluginDefinition[];
@@ -58,7 +57,7 @@ export default class MockFlipper {
   private _clients: Client[] = [];
   private _deviceCounter: number = 0;
   private _clientCounter: number = 0;
-  flipperServer: FlipperServer = TestUtils.createFlipperServerMock();
+  flipperServer: FlipperServer = getRenderHostInstance().flipperServer;
 
   public get store(): Store {
     return this._store;
@@ -96,10 +95,6 @@ export default class MockFlipper {
       this._logger,
     );
     this._store.dispatch(registerPlugins(plugins ?? []));
-    this._store.dispatch({
-      type: 'SET_FLIPPER_SERVER',
-      payload: this.flipperServer,
-    });
   }
 
   public async initWithDeviceAndClient(
diff --git a/desktop/flipper-ui-core/src/test-utils/TestDevice.tsx b/desktop/flipper-ui-core/src/test-utils/TestDevice.tsx
index ce4b39f7f..6547ca8c9 100644
--- a/desktop/flipper-ui-core/src/test-utils/TestDevice.tsx
+++ b/desktop/flipper-ui-core/src/test-utils/TestDevice.tsx
@@ -10,6 +10,7 @@
 import {DeviceOS, DeviceType} from 'flipper-plugin';
 import {DeviceSpec} from 'flipper-common';
 import BaseDevice from '../devices/BaseDevice';
+import {getRenderHostInstance} from '../RenderHost';
 
 export class TestDevice extends BaseDevice {
   constructor(
@@ -19,21 +20,12 @@ export class TestDevice extends BaseDevice {
     os: DeviceOS,
     specs?: DeviceSpec[],
   ) {
-    super(
-      {
-        async connect() {},
-        on: jest.fn(),
-        off: jest.fn(),
-        exec: jest.fn(),
-        close: jest.fn(),
-      },
-      {
-        serial,
-        deviceType,
-        title,
-        os,
-        specs,
-      },
-    );
+    super(getRenderHostInstance().flipperServer, {
+      serial,
+      deviceType,
+      title,
+      os,
+      specs,
+    });
   }
 }
diff --git a/desktop/jest.config.js b/desktop/jest.config.js
index 8b8ac90e4..152a1fad2 100644
--- a/desktop/jest.config.js
+++ b/desktop/jest.config.js
@@ -12,8 +12,8 @@ module.exports = {
     '^.*__tests__(/|\\\\).*\\.tsx?$': 'ts-jest',
     '\\.(js|tsx?)$': '<rootDir>/scripts/jest-transform.js',
   },
-  setupFiles: ['<rootDir>/scripts/jest-setup.js'],
-  setupFilesAfterEnv: ['<rootDir>/scripts/jest-setup-after.js'],
+  setupFiles: ['<rootDir>/scripts/jest-setup.ts'],
+  setupFilesAfterEnv: ['<rootDir>/scripts/jest-setup-after.ts'],
   moduleNameMapper: {
     '^flipper$': '<rootDir>/app/src',
     '^flipper-plugin$': '<rootDir>/flipper-plugin/src',
diff --git a/desktop/scripts/jest-setup-after.js b/desktop/scripts/jest-setup-after.js
deleted file mode 100644
index fbdc7ae8c..000000000
--- a/desktop/scripts/jest-setup-after.js
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- */
-
-// jest-setup-after will run after Jest has been initialized, so that it can be adapted.
-import {cleanup} from '@testing-library/react';
-
-const test = global.test;
-if (!test) {
-  throw new Error('Failed jest test object');
-}
-/**
- * This test will not be executed on Github / SandCastle,
- * since, for example, it relies on precise timer reliability
- */
-test.local = function local() {
-  const fn = process.env.SANDCASTLE || process.env.CI ? test.skip : test;
-  // eslint-disable-next-line
-  return fn.apply(null, arguments);
-};
-
-/**
- * This test will only run on non-windows machines
- */
-test.unix = function local() {
-  const fn = process.platform === 'win32' ? test.skip : test;
-  // eslint-disable-next-line
-  return fn.apply(null, arguments);
-};
-
-afterEach(cleanup);
-
-console.debug = function () {
-  // Intentional noop, we don't want debug statements in Jest runs
-};
-
-// make perf tools available in Node (it is available in Browser / Electron just fine)
-const {PerformanceObserver, performance} = require('perf_hooks');
-Object.freeze(performance);
-Object.freeze(Object.getPrototypeOf(performance));
-// Something in our unit tests is messing with the performance global
-// This fixes that.....
-Object.defineProperty(global, 'performance', {
-  get() {
-    return performance;
-  },
-  set() {
-    throw new Error('Attempt to overwrite global.performance');
-  },
-});
-
-global.PerformanceObserver = PerformanceObserver;
-
-// https://jestjs.io/docs/manual-mocks#mocking-methods-which-are-not-implemented-in-jsdom
-Object.defineProperty(window, 'matchMedia', {
-  writable: true,
-  value: jest.fn().mockImplementation((query) => ({
-    matches: false,
-    media: query,
-    onchange: null,
-    addListener: jest.fn(), // deprecated
-    removeListener: jest.fn(), // deprecated
-    addEventListener: jest.fn(),
-    removeEventListener: jest.fn(),
-    dispatchEvent: jest.fn(),
-  })),
-});
diff --git a/desktop/scripts/jest-setup-after.ts b/desktop/scripts/jest-setup-after.ts
new file mode 100644
index 000000000..06a3dbdd1
--- /dev/null
+++ b/desktop/scripts/jest-setup-after.ts
@@ -0,0 +1,172 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ */
+
+// jest-setup-after will run after Jest has been initialized, so that it can be adapted.
+
+import {cleanup} from '@testing-library/react';
+import {resolve} from 'path';
+import {tmpdir} from 'os';
+
+window.FlipperRenderHostInstance = createStubRenderHost();
+
+require('../flipper-ui-core/src/fb-stubs/Logger').init(undefined, {
+  isTest: true,
+});
+
+import {TestUtils} from 'flipper-plugin';
+import {FlipperServerConfig, ReleaseChannel, Tristate} from 'flipper-common';
+import type {RenderHost} from 'flipper-ui-core';
+
+const test = global.test;
+if (!test) {
+  throw new Error('Failed jest test object');
+}
+/**
+ * This test will not be executed on Github / SandCastle,
+ * since, for example, it relies on precise timer reliability
+ */
+(test as any).local = function local() {
+  const fn = process.env.SANDCASTLE || process.env.CI ? test.skip : test;
+  // eslint-disable-next-line
+  return fn.apply(null, arguments as any);
+};
+
+/**
+ * This test will only run on non-windows machines
+ */
+(test as any).unix = function local() {
+  const fn = process.platform === 'win32' ? test.skip : test;
+  // eslint-disable-next-line
+  return fn.apply(null, arguments as any);
+};
+
+beforeEach(() => {
+  // Fresh mock flipperServer for every test
+  window.FlipperRenderHostInstance = createStubRenderHost();
+});
+
+afterEach(cleanup);
+
+console.debug = function () {
+  // Intentional noop, we don't want debug statements in Jest runs
+};
+
+// make perf tools available in Node (it is available in Browser / Electron just fine)
+const {PerformanceObserver, performance} = require('perf_hooks');
+Object.freeze(performance);
+Object.freeze(Object.getPrototypeOf(performance));
+// Something in our unit tests is messing with the performance global
+// This fixes that.....
+Object.defineProperty(global, 'performance', {
+  get() {
+    return performance;
+  },
+  set() {
+    throw new Error('Attempt to overwrite global.performance');
+  },
+});
+
+global.PerformanceObserver = PerformanceObserver;
+
+// https://jestjs.io/docs/manual-mocks#mocking-methods-which-are-not-implemented-in-jsdom
+Object.defineProperty(window, 'matchMedia', {
+  writable: true,
+  value: jest.fn().mockImplementation((query) => ({
+    matches: false,
+    media: query,
+    onchange: null,
+    addListener: jest.fn(), // deprecated
+    removeListener: jest.fn(), // deprecated
+    addEventListener: jest.fn(),
+    removeEventListener: jest.fn(),
+    dispatchEvent: jest.fn(),
+  })),
+});
+
+function createStubRenderHost(): RenderHost {
+  const rootPath = resolve(__dirname, '..');
+  const stubConfig: FlipperServerConfig = {
+    env: {...process.env},
+    gatekeepers: {
+      TEST_PASSING_GK: true,
+      TEST_FAILING_GK: false,
+    },
+    isProduction: false,
+    launcherSettings: {
+      ignoreLocalPin: false,
+      releaseChannel: ReleaseChannel.DEFAULT,
+    },
+    paths: {
+      appPath: rootPath,
+      desktopPath: `/dev/null`,
+      execPath: process.execPath,
+      homePath: `/dev/null`,
+      staticPath: resolve(rootPath, 'static'),
+      tempPath: tmpdir(),
+    },
+    processConfig: {
+      disabledPlugins: new Set(),
+      lastWindowPosition: null,
+      launcherEnabled: false,
+      launcherMsg: null,
+      screenCapturePath: `/dev/null`,
+    },
+    settings: {
+      androidHome: `/dev/null`,
+      darkMode: 'light',
+      enableAndroid: false,
+      enableIOS: false,
+      enablePhysicalIOS: false,
+      enablePrefetching: Tristate.False,
+      idbPath: `/dev/null`,
+      reactNative: {
+        shortcuts: {enabled: false, openDevMenu: '', reload: ''},
+      },
+      showWelcomeAtStartup: false,
+      suppressPluginErrors: false,
+    },
+    validWebSocketOrigins: [],
+  };
+
+  return {
+    processId: -1,
+    isProduction: false,
+    readTextFromClipboard() {
+      return '';
+    },
+    writeTextToClipboard() {},
+    async importFile() {
+      return undefined;
+    },
+    async exportFile() {
+      return undefined;
+    },
+    registerShortcut() {
+      return () => undefined;
+    },
+    hasFocus() {
+      return true;
+    },
+    onIpcEvent() {},
+    sendIpcEvent() {},
+    shouldUseDarkColors() {
+      return false;
+    },
+    restartFlipper() {},
+    openLink() {},
+    serverConfig: stubConfig,
+    loadDefaultPlugins() {
+      return {};
+    },
+    GK(gk: string) {
+      return stubConfig.gatekeepers[gk] ?? false;
+    },
+    flipperServer: TestUtils.createFlipperServerMock(),
+  };
+}
diff --git a/desktop/scripts/jest-setup.js b/desktop/scripts/jest-setup.ts
similarity index 87%
rename from desktop/scripts/jest-setup.js
rename to desktop/scripts/jest-setup.ts
index 4147431a5..e60552bbe 100644
--- a/desktop/scripts/jest-setup.js
+++ b/desktop/scripts/jest-setup.ts
@@ -23,12 +23,11 @@ if (process.env.TZ !== timezone) {
 // Make sure we have identical formatting of Dates everywhere
 const toLocaleString = Date.prototype.toLocaleString;
 // eslint-disable-next-line no-extend-native
-Date.prototype.toLocaleString = function (_locale, ...args) {
+(Date as any).prototype.toLocaleString = function (
+  _locale: any,
+  ...args: any[]
+) {
   return toLocaleString.call(this, 'en-US', ...args);
 };
 
 require('immer').enableMapSet();
-
-require('../flipper-ui-core/src/fb-stubs/Logger').init(undefined, {
-  isTest: true,
-});