31 files changed, 23 insertions, 45 deletions
diff --git a/Makefile b/Makefile
index ddbfd0f885..d324cb7514 100644
--- a/Makefile
+++ b/Makefile
@@ -409,9 +409,6 @@ test-pummel: all
 test-internet: all
 	$(PYTHON) tools/test.py internet
 
-test-inspector: all
-	$(PYTHON) tools/test.py inspector
-
 test-node-inspect: $(NODE_EXE)
 	USE_EMBEDDED_NODE_INSPECT=1 $(NODE) tools/test-npm-package \
 		--install deps/node-inspect test
diff --git a/test/README.md b/test/README.md
index 86826f493a..d214f2fc10 100644
--- a/test/README.md
+++ b/test/README.md
@@ -19,7 +19,6 @@ On how to run tests in this directory, see
 |es-module          |Yes            |Test ESM module loading.|
 |fixtures           |               |Test fixtures used in various tests throughout the test suite.|
 |gc                 |No             |Tests for garbage collection related functionality.|
-|inspector          |Yes            |Tests for the V8 inspector integration.|
 |internet           |No             |Tests that make real outbound connections (mainly networking related modules). Tests for networking related modules may also be present in        other directories, but those tests do not make outbound connections.|
 |known_issues       |Yes            |Tests reproducing known issues within the system. All tests inside of this directory are expected to fail consistently. If a test doesn't fail on certain platforms, those should be skipped via `known_issues.status`.|
 |message            |Yes            |Tests for messages that are output for various conditions (```console.log```, error messages etc.)|
diff --git a/test/inspector/inspector-helper.js b/test/common/inspector-helper.js
index 81aa046bf3..81aa046bf3 100644
--- a/test/inspector/inspector-helper.js
+++ b/test/common/inspector-helper.js
diff --git a/test/inspector/global-function.js b/test/fixtures/inspector-global-function.js
index d72bacd7ca..d72bacd7ca 100644
--- a/test/inspector/global-function.js
+++ b/test/fixtures/inspector-global-function.js
diff --git a/test/inspector/inspector.status b/test/inspector/inspector.status
deleted file mode 100644
index 9c1662f24c..0000000000
--- a/test/inspector/inspector.status
+++ /dev/null
@@ -1,16 +0,0 @@
-prefix inspector
-
-# To mark a test as flaky, list the test name in the appropriate section
-# below, without ".js", followed by ": PASS,FLAKY". Example:
-# sample-test                        : PASS,FLAKY
-
-[true] # This section applies to all platforms
-
-[$system==aix]
-test-stop-profile-after-done: PASS, FLAKY
-
-[$system==win32]
-test-bindings               : PASS, FLAKY
-test-debug-end              : PASS, FLAKY
-test-stop-profile-after-done: PASS, FLAKY
-
diff --git a/test/inspector/testcfg.py b/test/inspector/testcfg.py
deleted file mode 100644
index 93182b6abe..0000000000
--- a/test/inspector/testcfg.py
+++ /dev/null
@@ -1,6 +0,0 @@
-import sys, os
-sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
-import testpy
-
-def GetConfiguration(context, root):
-  return testpy.SimpleTestConfiguration(context, root, 'inspector')
diff --git a/test/parallel/parallel.status b/test/parallel/parallel.status
index fda5e01e50..1817501c98 100644
--- a/test/parallel/parallel.status
+++ b/test/parallel/parallel.status
@@ -7,6 +7,9 @@ prefix parallel
 [true] # This section applies to all platforms
 
 [$system==win32]
+test-inspector-bindings               : PASS, FLAKY
+test-inspector-debug-end              : PASS, FLAKY
+test-inspector-stop-profile-after-done: PASS, FLAKY
 
 [$system==linux]
 
@@ -19,3 +22,5 @@ test-npm-install:      PASS,FLAKY
 
 [$system==freebsd]
 
+[$system==aix]
+test-inspector-stop-profile-after-done: PASS, FLAKY
diff --git a/test/inspector/test-async-hook-setup-at-inspect.js b/test/parallel/test-inspect-async-hook-setup-at-inspect.js
index bbf418a858..869ec21ca9 100644
--- a/test/inspector/test-async-hook-setup-at-inspect.js
+++ b/test/parallel/test-inspect-async-hook-setup-at-inspect.js
@@ -3,7 +3,7 @@ const common = require('../common');
 common.skipIfInspectorDisabled();
 common.skipIf32Bits();
 common.crashOnUnhandledRejection();
-const { NodeInstance } = require('../inspector/inspector-helper.js');
+const { NodeInstance } = require('../common/inspector-helper.js');
 const assert = require('assert');
 
 // Even with --inspect, the default async call stack depth is 0. We need a
diff --git a/test/inspector/test-async-hook-setup-at-inspect-brk.js b/test/parallel/test-inspector-async-hook-setup-at-inspect-brk.js
index 7e29060552..980e9e4d46 100644
--- a/test/inspector/test-async-hook-setup-at-inspect-brk.js
+++ b/test/parallel/test-inspector-async-hook-setup-at-inspect-brk.js
@@ -3,7 +3,7 @@ const common = require('../common');
 common.skipIfInspectorDisabled();
 common.skipIf32Bits();
 common.crashOnUnhandledRejection();
-const { NodeInstance } = require('./inspector-helper.js');
+const { NodeInstance } = require('../common/inspector-helper.js');
 const assert = require('assert');
 
 const script = `
diff --git a/test/inspector/test-async-hook-setup-at-signal.js b/test/parallel/test-inspector-async-hook-setup-at-signal.js
index f0150bc7ac..96e8b28a7a 100644
--- a/test/inspector/test-async-hook-setup-at-signal.js
+++ b/test/parallel/test-inspector-async-hook-setup-at-signal.js
@@ -3,7 +3,7 @@ const common = require('../common');
 common.skipIfInspectorDisabled();
 common.skipIf32Bits();
 common.crashOnUnhandledRejection();
-const { NodeInstance } = require('../inspector/inspector-helper.js');
+const { NodeInstance } = require('../common/inspector-helper.js');
 const assert = require('assert');
 
 const script = `
diff --git a/test/inspector/test-async-hook-teardown-at-debug-end.js b/test/parallel/test-inspector-async-hook-teardown-at-debug-end.js
index 9084efdd41..9084efdd41 100644
--- a/test/inspector/test-async-hook-teardown-at-debug-end.js
+++ b/test/parallel/test-inspector-async-hook-teardown-at-debug-end.js
diff --git a/test/inspector/test-async-stack-traces-promise-then.js b/test/parallel/test-inspector-async-stack-traces-promise-then.js
index 9e28d0d51e..a321855b5e 100644
--- a/test/inspector/test-async-stack-traces-promise-then.js
+++ b/test/parallel/test-inspector-async-stack-traces-promise-then.js
@@ -3,7 +3,7 @@ const common = require('../common');
 common.skipIfInspectorDisabled();
 common.skipIf32Bits();
 common.crashOnUnhandledRejection();
-const { NodeInstance } = require('./inspector-helper');
+const { NodeInstance } = require('../common/inspector-helper');
 const assert = require('assert');
 
 const script = `runTest();
diff --git a/test/inspector/test-async-stack-traces-set-interval.js b/test/parallel/test-inspector-async-stack-traces-set-interval.js
index 78f7a8e980..e778bfc802 100644
--- a/test/inspector/test-async-stack-traces-set-interval.js
+++ b/test/parallel/test-inspector-async-stack-traces-set-interval.js
@@ -3,7 +3,7 @@ const common = require('../common');
 common.skipIfInspectorDisabled();
 common.skipIf32Bits();
 common.crashOnUnhandledRejection();
-const { NodeInstance } = require('./inspector-helper');
+const { NodeInstance } = require('../common/inspector-helper');
 const assert = require('assert');
 
 const script = 'setInterval(() => { debugger; }, 50);';
diff --git a/test/inspector/test-bindings.js b/test/parallel/test-inspector-bindings.js
index b2140c11a3..b2140c11a3 100644
--- a/test/inspector/test-bindings.js
+++ b/test/parallel/test-inspector-bindings.js
diff --git a/test/inspector/test-inspector-break-e.js b/test/parallel/test-inspector-break-e.js
index 0e5b837bc5..1a8f8ca50d 100644
--- a/test/inspector/test-inspector-break-e.js
+++ b/test/parallel/test-inspector-break-e.js
@@ -4,7 +4,7 @@ const common = require('../common');
 common.skipIfInspectorDisabled();
 
 const assert = require('assert');
-const { NodeInstance } = require('./inspector-helper.js');
+const { NodeInstance } = require('../common/inspector-helper.js');
 
 async function runTests() {
   const instance = new NodeInstance(undefined, 'console.log(10)');
diff --git a/test/inspector/test-break-when-eval.js b/test/parallel/test-inspector-break-when-eval.js
index ddd8220bb9..e5d01cb189 100644
--- a/test/inspector/test-break-when-eval.js
+++ b/test/parallel/test-inspector-break-when-eval.js
@@ -2,10 +2,10 @@
 const common = require('../common');
 common.skipIfInspectorDisabled();
 const assert = require('assert');
-const { NodeInstance } = require('./inspector-helper.js');
-const path = require('path');
+const { NodeInstance } = require('../common/inspector-helper.js');
+const fixtures = require('../common/fixtures');
 
-const script = path.join(path.dirname(module.filename), 'global-function.js');
+const script = fixtures.path('inspector-global-function.js');
 
 async function setupDebugger(session) {
   console.log('[test]', 'Setting up a debugger');
diff --git a/test/inspector/test-contexts.js b/test/parallel/test-inspector-contexts.js
index 54acfab0d5..54acfab0d5 100644
--- a/test/inspector/test-contexts.js
+++ b/test/parallel/test-inspector-contexts.js
diff --git a/test/inspector/test-debug-brk-flag.js b/test/parallel/test-inspector-debug-brk-flag.js
index f0a4d97602..235e7043d8 100644
--- a/test/inspector/test-debug-brk-flag.js
+++ b/test/parallel/test-inspector-debug-brk-flag.js
@@ -5,7 +5,7 @@ common.skipIfInspectorDisabled();
 
 const assert = require('assert');
 const { mainScriptPath,
-        NodeInstance } = require('./inspector-helper.js');
+        NodeInstance } = require('../common/inspector-helper.js');
 
 async function testBreakpointOnStart(session) {
   const commands = [
diff --git a/test/inspector/test-debug-end.js b/test/parallel/test-inspector-debug-end.js
index 57ce019083..effef9f233 100644
--- a/test/inspector/test-debug-end.js
+++ b/test/parallel/test-inspector-debug-end.js
@@ -2,7 +2,7 @@
 const common = require('../common');
 common.skipIfInspectorDisabled();
 const { strictEqual } = require('assert');
-const { NodeInstance } = require('./inspector-helper.js');
+const { NodeInstance } = require('../common/inspector-helper.js');
 
 async function testNoServerNoCrash() {
   console.log('Test there\'s no crash stopping server that was not started');
diff --git a/test/inspector/test-exception.js b/test/parallel/test-inspector-exception.js
index eab59ee9f4..743742f50f 100644
--- a/test/inspector/test-exception.js
+++ b/test/parallel/test-inspector-exception.js
@@ -5,7 +5,7 @@ const fixtures = require('../common/fixtures');
 common.skipIfInspectorDisabled();
 
 const assert = require('assert');
-const { NodeInstance } = require('./inspector-helper.js');
+const { NodeInstance } = require('../common/inspector-helper.js');
 
 const script = fixtures.path('throws_error.js');
 
diff --git a/test/inspector/test-ip-detection.js b/test/parallel/test-inspector-ip-detection.js
index 5a6a116144..f7dee4494d 100644
--- a/test/inspector/test-ip-detection.js
+++ b/test/parallel/test-inspector-ip-detection.js
@@ -4,7 +4,7 @@ const common = require('../common');
 common.skipIfInspectorDisabled();
 
 const assert = require('assert');
-const { NodeInstance } = require('./inspector-helper.js');
+const { NodeInstance } = require('../common/inspector-helper.js');
 const os = require('os');
 
 const ip = pickIPv4Address();
diff --git a/test/inspector/test-not-blocked-on-idle.js b/test/parallel/test-inspector-not-blocked-on-idle.js
index 8684d6f314..68e4eaaa57 100644
--- a/test/inspector/test-not-blocked-on-idle.js
+++ b/test/parallel/test-inspector-not-blocked-on-idle.js
@@ -1,7 +1,7 @@
 'use strict';
 const common = require('../common');
 common.skipIfInspectorDisabled();
-const { NodeInstance } = require('./inspector-helper.js');
+const { NodeInstance } = require('../common/inspector-helper.js');
 
 async function runTests() {
   const script = 'setInterval(() => {debugger;}, 60000);';
diff --git a/test/inspector/test-port-zero-cluster.js b/test/parallel/test-inspector-port-zero-cluster.js
index f64e05f314..f64e05f314 100644
--- a/test/inspector/test-port-zero-cluster.js
+++ b/test/parallel/test-inspector-port-zero-cluster.js
diff --git a/test/inspector/test-port-zero.js b/test/parallel/test-inspector-port-zero.js
index a3eb08e5fb..a3eb08e5fb 100644
--- a/test/inspector/test-port-zero.js
+++ b/test/parallel/test-inspector-port-zero.js
diff --git a/test/inspector/test-scriptparsed-context.js b/test/parallel/test-inspector-scriptparsed-context.js
index 149173b7af..f295d737da 100644
--- a/test/inspector/test-scriptparsed-context.js
+++ b/test/parallel/test-inspector-scriptparsed-context.js
@@ -2,7 +2,7 @@
 const common = require('../common');
 common.skipIfInspectorDisabled();
 common.crashOnUnhandledRejection();
-const { NodeInstance } = require('./inspector-helper.js');
+const { NodeInstance } = require('../common/inspector-helper.js');
 const assert = require('assert');
 
 const script = `
diff --git a/test/inspector/test-stop-profile-after-done.js b/test/parallel/test-inspector-stop-profile-after-done.js
index 314c429d46..4762bc5239 100644
--- a/test/inspector/test-stop-profile-after-done.js
+++ b/test/parallel/test-inspector-stop-profile-after-done.js
@@ -2,7 +2,7 @@
 const common = require('../common');
 common.skipIfInspectorDisabled();
 const assert = require('assert');
-const { NodeInstance } = require('./inspector-helper.js');
+const { NodeInstance } = require('../common/inspector-helper.js');
 
 async function runTests() {
   const child = new NodeInstance(['--inspect=0'],
diff --git a/test/inspector/test-stops-no-file.js b/test/parallel/test-inspector-stops-no-file.js
index 772063b279..772063b279 100644
--- a/test/inspector/test-stops-no-file.js
+++ b/test/parallel/test-inspector-stops-no-file.js
diff --git a/test/inspector/test-inspector.js b/test/parallel/test-inspector.js
index 6a5dbe6003..992a12e902 100644
--- a/test/inspector/test-inspector.js
+++ b/test/parallel/test-inspector.js
@@ -6,7 +6,7 @@ common.skipIfInspectorDisabled();
 const assert = require('assert');
 const { mainScriptPath,
         readMainScriptSource,
-        NodeInstance } = require('./inspector-helper.js');
+        NodeInstance } = require('../common/inspector-helper.js');
 
 function checkListResponse(response) {
   assert.strictEqual(1, response.length);
diff --git a/test/inspector/test-inspector-enabled.js b/test/sequential/test-inspector-enabled.js
index a7a0832793..a7a0832793 100644
--- a/test/inspector/test-inspector-enabled.js
+++ b/test/sequential/test-inspector-enabled.js
diff --git a/test/inspector/test-port-cluster.js b/test/sequential/test-inspector-port-cluster.js
index 3b2464d812..3b2464d812 100644
--- a/test/inspector/test-port-cluster.js
+++ b/test/sequential/test-inspector-port-cluster.js
diff --git a/vcbuild.bat b/vcbuild.bat
index ab9f40de03..20555dec79 100644
--- a/vcbuild.bat
+++ b/vcbuild.bat
@@ -81,7 +81,6 @@ if /i "%1"=="test-addons-napi"   set test_args=%test_args% addons-napi&set build
 if /i "%1"=="test-simple"   set test_args=%test_args% sequential parallel -J&goto arg-ok
 if /i "%1"=="test-message"  set test_args=%test_args% message&goto arg-ok
 if /i "%1"=="test-gc"       set test_args=%test_args% gc&set build_testgc_addon=1&goto arg-ok
-if /i "%1"=="test-inspector" set test_args=%test_args% inspector&goto arg-ok
 if /i "%1"=="test-tick-processor" set test_args=%test_args% tick-processor&goto arg-ok
 if /i "%1"=="test-internet" set test_args=%test_args% internet&goto arg-ok
 if /i "%1"=="test-pummel"   set test_args=%test_args% pummel&goto arg-ok
@@ -536,7 +535,7 @@ echo Failed to create vc project files.
 goto exit
 
 :help
-echo vcbuild.bat [debug/release] [msi] [test/test-ci/test-all/test-uv/test-inspector/test-internet/test-pummel/test-simple/test-message/test-async-hooks/test-v8/test-v8-intl/test-v8-benchmarks/test-v8-all] [clean] [noprojgen] [small-icu/full-icu/without-intl] [nobuild] [sign] [x86/x64] [vs2015/vs2017] [download-all] [enable-vtune] [lint/lint-ci] [no-NODE-OPTIONS] [link-module path-to-module]
+echo vcbuild.bat [debug/release] [msi] [test/test-ci/test-all/test-uv/test-internet/test-pummel/test-simple/test-message/test-async-hooks/test-v8/test-v8-intl/test-v8-benchmarks/test-v8-all] [clean] [noprojgen] [small-icu/full-icu/without-intl] [nobuild] [sign] [x86/x64] [vs2015/vs2017] [download-all] [enable-vtune] [lint/lint-ci] [no-NODE-OPTIONS] [link-module path-to-module]
 echo Examples:
 echo   vcbuild.bat                          : builds release build
 echo   vcbuild.bat debug                    : builds debug build