diff --git a/desktop/doctor/.eslintrc.js b/desktop/doctor/.eslintrc.js
deleted file mode 100644
index cabcfb08b3c..00000000000
--- a/desktop/doctor/.eslintrc.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- */
-
-module.exports = {
-  rules: {
-    'node/no-sync': 'off',
-  },
-};
diff --git a/desktop/doctor/README.md b/desktop/doctor/README.md
deleted file mode 100644
index 74cab895579..00000000000
--- a/desktop/doctor/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Flipper Doctor
-
-This package exists for running checks to diagnose and potentially fix issues affecting the operation of Flipper.
-It's designed to be primarily used programmatically but may also expose a CLI interface.
-
-## Usage
-`cd doctor`
-`yarn run run`
diff --git a/desktop/doctor/jestconfig.json b/desktop/doctor/jestconfig.json
deleted file mode 100644
index 20c25c0f71d..00000000000
--- a/desktop/doctor/jestconfig.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "transform": {
-    "^.+\\.(t|j)sx?$": "ts-jest"
-  },
-  "testRegex": "(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",
-  "moduleFileExtensions": ["ts", "tsx", "js", "jsx", "json", "node"]
-}
diff --git a/desktop/doctor/package.json b/desktop/doctor/package.json
deleted file mode 100644
index 2c703e4e3da..00000000000
--- a/desktop/doctor/package.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "name": "flipper-doctor",
-  "version": "0.0.0",
-  "description": "Utility for checking for issues with a flipper installation",
-  "main": "lib/index.js",
-  "flipperBundlerEntry": "src",
-  "types": "lib/index.d.ts",
-  "license": "MIT",
-  "devDependencies": {
-    "@types/fb-watchman": "2.0.1",
-    "@types/node": "^17.0.31"
-  },
-  "scripts": {
-    "reset": "rimraf lib *.tsbuildinfo",
-    "build": "tsc -b",
-    "prepack": "yarn reset && yarn build"
-  },
-  "files": [
-    "lib/**/*"
-  ],
-  "keywords": [
-    "Flipper",
-    "Doctor"
-  ],
-  "author": "Facebook, Inc",
-  "dependencies": {
-    "envinfo": "^7.8.1",
-    "fb-watchman": "^2.0.2",
-    "flipper-common": "0.0.0",
-    "fs-extra": "^11.1.1"
-  }
-}
diff --git a/desktop/doctor/tsconfig.json b/desktop/doctor/tsconfig.json
deleted file mode 100644
index 195fa4fb690..00000000000
--- a/desktop/doctor/tsconfig.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "extends": "../tsconfig.base.json",
-  "compilerOptions": {
-    "outDir": "lib",
-    "rootDir": "src",
-    "types": ["node"]
-  },
-  "references": [
-    {
-      "path": "../flipper-common"
-    }
-  ]
-}
diff --git a/desktop/doctor/tslint.json b/desktop/doctor/tslint.json
deleted file mode 100644
index 85e60a40a1c..00000000000
--- a/desktop/doctor/tslint.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-   "extends": ["tslint:recommended", "tslint-config-prettier"]
-}
diff --git a/desktop/flipper-server/package.json b/desktop/flipper-server/package.json
index 7f3549d5aa9..b602c98d9f2 100644
--- a/desktop/flipper-server/package.json
+++ b/desktop/flipper-server/package.json
@@ -10,8 +10,10 @@
   "bugs": "https://github.com/facebook/flipper/issues",
   "dependencies": {
     "chalk": "^4",
+    "envinfo": "^7.8.1",
     "exit-hook": "^2.1.1",
     "express": "^4.17.3",
+    "fb-watchman": "^2.0.2",
     "file-stream-rotator": "^0.6.1",
     "flipper-common": "0.0.0",
     "flipper-pkg-lib": "0.0.0",
@@ -31,7 +33,6 @@
     "archiver": "^5.3.1",
     "async-mutex": "^0.3.2",
     "axios": "^0.26.0",
-    "flipper-doctor": "0.0.0",
     "flipper-plugin-lib": "0.0.0",
     "form-data": "^4.0.0",
     "invariant": "^2.2.4",
@@ -56,6 +57,7 @@
   },
   "devDependencies": {
     "@types/express": "^4.17.13",
+    "@types/fb-watchman": "^2.0.1",
     "@types/http-proxy": "^1.17.8",
     "@types/node": "^17.0.31",
     "@types/archiver": "^5.3.1",
diff --git a/desktop/doctor/src/environmentInfo.tsx b/desktop/flipper-server/src/doctor/environmentInfo.tsx
similarity index 100%
rename from desktop/doctor/src/environmentInfo.tsx
rename to desktop/flipper-server/src/doctor/environmentInfo.tsx
diff --git a/desktop/doctor/src/fb-stubs/validateSelectedXcodeVersion.tsx b/desktop/flipper-server/src/doctor/fb-stubs/validateSelectedXcodeVersion.tsx
similarity index 100%
rename from desktop/doctor/src/fb-stubs/validateSelectedXcodeVersion.tsx
rename to desktop/flipper-server/src/doctor/fb-stubs/validateSelectedXcodeVersion.tsx
diff --git a/desktop/doctor/src/globals.d.ts b/desktop/flipper-server/src/doctor/globals.d.ts
similarity index 100%
rename from desktop/doctor/src/globals.d.ts
rename to desktop/flipper-server/src/doctor/globals.d.ts
diff --git a/desktop/doctor/src/index.tsx b/desktop/flipper-server/src/doctor/index.tsx
similarity index 98%
rename from desktop/doctor/src/index.tsx
rename to desktop/flipper-server/src/doctor/index.tsx
index d0fcc5ff582..f74bdbb1cb3 100644
--- a/desktop/doctor/src/index.tsx
+++ b/desktop/flipper-server/src/doctor/index.tsx
@@ -75,6 +75,7 @@ export function getHealthchecks(
                 run: async (
                   _: FlipperDoctor.EnvironmentInfo,
                 ): Promise<FlipperDoctor.HealthcheckRunResult> => {
+                  // eslint-disable-next-line node/no-sync
                   const hasProblem = !fs.existsSync(
                     '/Applications/Android Studio.app',
                   );
@@ -106,6 +107,7 @@ export function getHealthchecks(
                 hasProblem: true,
                 message: ['android.sdk--no_ANDROID_HOME'],
               };
+              // eslint-disable-next-line node/no-sync
             } else if (!fs.existsSync(androidHome)) {
               const androidStudioAndroidHome = `${os.homedir()}/Library/Android/sdk`;
               const globalAndroidHome = '/opt/android_sdk';
@@ -125,6 +127,7 @@ export function getHealthchecks(
               };
             } else {
               const platformToolsDir = path.join(androidHome, 'platform-tools');
+              // eslint-disable-next-line node/no-sync
               if (!fs.existsSync(platformToolsDir)) {
                 return {
                   hasProblem: true,
diff --git a/desktop/flipper-server/src/utils/runHealthchecks.tsx b/desktop/flipper-server/src/utils/runHealthchecks.tsx
index 728ce170680..6be98f1fc03 100644
--- a/desktop/flipper-server/src/utils/runHealthchecks.tsx
+++ b/desktop/flipper-server/src/utils/runHealthchecks.tsx
@@ -7,7 +7,7 @@
  * @format
  */
 
-import {getHealthchecks, getEnvInfo} from 'flipper-doctor';
+import {getHealthchecks, getEnvInfo} from '../doctor';
 import {FlipperDoctor} from 'flipper-common';
 import produce from 'immer';
 
diff --git a/desktop/flipper-server/tsconfig.json b/desktop/flipper-server/tsconfig.json
index 1d2ef734773..045fca6a95d 100644
--- a/desktop/flipper-server/tsconfig.json
+++ b/desktop/flipper-server/tsconfig.json
@@ -16,9 +16,6 @@
   },
   "include": ["./src/**/*"],
   "references": [
-    {
-      "path": "../doctor"
-    },
     {
       "path": "../flipper-common"
     },
diff --git a/desktop/jest.config.js b/desktop/jest.config.js
index 4b0aa921902..3926aa8616c 100644
--- a/desktop/jest.config.js
+++ b/desktop/jest.config.js
@@ -19,7 +19,7 @@ module.exports = {
     '^flipper-plugin$': '<rootDir>/flipper-plugin/src',
     '^flipper-(server-core|ui-core|frontend-core|common)$':
       '<rootDir>/flipper-$1/src',
-    '^flipper-(pkg|pkg-lib|doctor|test-utils)$': '<rootDir>/$1/src',
+    '^flipper-(pkg|pkg-lib|test-utils)$': '<rootDir>/$1/src',
     '^.+\\.(css|scss)$': '<rootDir>/scripts/jest-css-stub.js',
   },
   clearMocks: true,
diff --git a/desktop/package.json b/desktop/package.json
index b551969f665..1f3ccd59aaf 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -170,7 +170,6 @@
     "packages": [
       "scripts",
       "babel-transformer",
-      "doctor",
       "pkg",
       "pkg-lib",
       "flipper-common",
diff --git a/desktop/scripts/build-flipper-server-release.tsx b/desktop/scripts/build-flipper-server-release.tsx
index 2a015c3bd86..c0b455ca7d7 100644
--- a/desktop/scripts/build-flipper-server-release.tsx
+++ b/desktop/scripts/build-flipper-server-release.tsx
@@ -270,7 +270,6 @@ async function linkLocalDeps(buildFolder: string) {
 
   const resolutions = {
     ...manifest.resolutions,
-    'flipper-doctor': `file:${rootDir}/doctor`,
     'flipper-common': `file:${rootDir}/flipper-common`,
     'flipper-server-client': `file:${rootDir}/flipper-server-client`,
     'flipper-pkg-lib': `file:${rootDir}/pkg-lib`,
diff --git a/desktop/scripts/start-flipper-server-dev.tsx b/desktop/scripts/start-flipper-server-dev.tsx
index 721eed61591..b5074fe3f43 100644
--- a/desktop/scripts/start-flipper-server-dev.tsx
+++ b/desktop/scripts/start-flipper-server-dev.tsx
@@ -129,13 +129,7 @@ async function startWatchChanges() {
     // We only watch for changes that might affect the server.
     // For UI changes, Metro / hot module reloading / fast refresh take care of the changes
     await Promise.all(
-      [
-        'doctor',
-        'pkg-lib',
-        'plugin-lib',
-        'flipper-common',
-        'flipper-server',
-      ].map((dir) =>
+      ['pkg-lib', 'plugin-lib', 'flipper-common', 'flipper-server'].map((dir) =>
         watchman.startWatchFiles(
           dir,
           () => {
diff --git a/desktop/tsc-root/tsconfig.json b/desktop/tsc-root/tsconfig.json
index 4909cf70855..2813cb948b1 100644
--- a/desktop/tsc-root/tsconfig.json
+++ b/desktop/tsc-root/tsconfig.json
@@ -30,9 +30,6 @@
     {
       "path": "../pkg-lib"
     },
-    {
-      "path": "../doctor"
-    },
     {
       "path": "../eslint-plugin-flipper"
     },
diff --git a/desktop/yarn.lock b/desktop/yarn.lock
index ede69c47ce4..a6bab64a0a4 100644
--- a/desktop/yarn.lock
+++ b/desktop/yarn.lock
@@ -3369,10 +3369,12 @@
     "@types/qs" "*"
     "@types/serve-static" "*"
 
-"@types/fb-watchman@2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@types/fb-watchman/-/fb-watchman-2.0.1.tgz#4f44c7b7ac98463488765d41d269272dd34cb815"
-  integrity sha512-iJ7/e6drSmuCzAp96/dpksm8YjxbhhyXWV6m1HPbRHvZwUOUZ5vZvZIAUJxKDtI0UpdNfDvLPiai0MTJmmS+HA==
+"@types/fb-watchman@^2.0.1":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@types/fb-watchman/-/fb-watchman-2.0.4.tgz#3a02379aa90d86ceb965a2beaebd7e79faa81e82"
+  integrity sha512-h7yAQ5Sf96PdZz+sfDDl6Hscl/JqsVXadjF6YHmJeWviziDCGQtqUQUDS2tYjfD/eTzhfZwNfwcfb91a4PaZKQ==
+  dependencies:
+    "@types/node" "*"
 
 "@types/file-saver@^2.0.5":
   version "2.0.5"