--- old/test/jdk/com/sun/jdi/lib/jdb/Jdb.java	2018-10-11 19:51:29.000000000 -0700
+++ new/test/jdk/com/sun/jdi/lib/jdb/Jdb.java	2018-10-11 19:51:29.000000000 -0700
@@ -207,6 +207,10 @@
     }
 
     public List<String> command(JdbCommand cmd) {
+        return command(cmd, false);
+    }
+
+    public List<String> command(JdbCommand cmd, boolean waitForSimplePrompt) {
         if (!jdb.isAlive()) {
             if (cmd.allowExit) {
                 // return remaining output
@@ -223,7 +227,7 @@
             throw new RuntimeException("Unexpected IO error while writing command '" + cmd.cmd + "' to jdb stdin stream");
         }
 
-        return waitForPrompt(1, cmd.allowExit);
+        return waitForSimplePrompt ? waitForSimplePrompt(1, cmd.allowExit) : waitForPrompt(1, cmd.allowExit);
     }
 
     public List<String> command(String cmd) {