diff --git a/test/common/inspector-cli.js b/test/common/inspector-cli.js
index 36d6328dcc9b39..c127b1dc292e7f 100644
--- a/test/common/inspector-cli.js
+++ b/test/common/inspector-cli.js
@@ -23,7 +23,10 @@ function startCLI(args, flags = [], spawnOpts = {}) {
     if (this === child.stderr) {
       stderrOutput += chunk;
     }
-    outputBuffer.push(chunk);
+    // TODO(trott): Figure out why the "breakpoints restored." message appears
+    // in unpredictable places especially on AIX in CI. We shouldn't be
+    // excluding it, but it gets in the way of the output checking for tests.
+    outputBuffer.push(chunk.replace(/\n*\d+ breakpoints restored\.\n*/mg, ''));
   }
 
   function getOutput() {
diff --git a/test/inspector-cli/test-inspector-cli-pid.js b/test/inspector-cli/test-inspector-cli-pid.js
index 92c81177650af3..c94ab52031111f 100644
--- a/test/inspector-cli/test-inspector-cli-pid.js
+++ b/test/inspector-cli/test-inspector-cli-pid.js
@@ -40,16 +40,7 @@ function launchTarget(...args) {
     })
     .then(() => cli.command('sb("alive.js", 3)'))
     .then(() => cli.waitFor(/break/))
-    // TODO: There is a known issue on AIX and some other operating systems
-    // where the breakpoints aren't properly resolved yet when we reach this
-    // point. Eventually that should be figured out but for now we don't
-    // want to fail builds because of it.
-    // What it should be:
-    //
-    // .then(() => cli.waitForPrompt())
-    //
-    // What we're diong for now:
-    .then(() => cli.waitFor(/>\s+(?:\n1 breakpoints restored\.)?$/))
+    .then(() => cli.waitForPrompt())
     .then(() => {
       assert.match(
         cli.output,