diff --git a/test/common.js b/test/common.js
index 3a49a53a11..a3540cb11a 100644
--- a/test/common.js
+++ b/test/common.js
@@ -646,8 +646,8 @@ exports.expectsError = function expectsError({code, type, message}) {
 };
 
 exports.skipIfInspectorDisabled = function skipIfInspectorDisabled() {
-  if (!exports.hasCrypto) {
-    exports.skip('missing ssl support so inspector is disabled');
+  if (process.config.variables.v8_enable_inspector === 0) {
+    exports.skip('V8 inspector is disabled');
     process.exit(0);
   }
 };
diff --git a/test/parallel/test-debug-prompt.js b/test/parallel/test-debug-prompt.js
index 82120859c7..81e579ed1e 100644
--- a/test/parallel/test-debug-prompt.js
+++ b/test/parallel/test-debug-prompt.js
@@ -1,9 +1,10 @@
 'use strict';
 
-require('../common');
+const common = require('../common');
+common.skipIfInspectorDisabled();
 const spawn = require('child_process').spawn;
 
-const proc = spawn(process.execPath, ['debug', 'foo']);
+const proc = spawn(process.execPath, ['inspect', 'foo']);
 proc.stdout.setEncoding('utf8');
 
 let output = '';
diff --git a/test/sequential/test-debugger-repeat-last.js b/test/sequential/test-debugger-repeat-last.js
index 9d1dd4754d..39572ab99b 100644
--- a/test/sequential/test-debugger-repeat-last.js
+++ b/test/sequential/test-debugger-repeat-last.js
@@ -1,5 +1,6 @@
 'use strict';
 const common = require('../common');
+common.skipIfInspectorDisabled();
 const path = require('path');
 const spawn = require('child_process').spawn;
 const assert = require('assert');
@@ -9,7 +10,7 @@ const fixture = path.join(
 );
 
 const args = [
-  'debug',
+  'inspect',
   `--port=${common.PORT}`,
   fixture
 ];