diff -r d2206a60da32 -r 5ff7480c9e28 test/langtools/jdk/jshell/ToolTabCommandTest.java
--- a/test/langtools/jdk/jshell/ToolTabCommandTest.java	Tue Dec 11 10:15:28 2018 +0100
+++ b/test/langtools/jdk/jshell/ToolTabCommandTest.java	Tue Dec 11 11:29:28 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,6 +41,10 @@
 @Test
 public class ToolTabCommandTest extends UITesting {
 
+    public ToolTabCommandTest() {
+        super(true);
+    }
+
     public void testCommand() throws Exception {
         // set terminal height so that help output won't hit page breaks
         System.setProperty("test.terminal.height", "1000000");
@@ -84,7 +88,7 @@
             waitOutput(out, resource("help.edit"));
 
             inputSink.write(INTERRUPT + "/env " + TAB);
-            waitOutput(out, PROMPT + "/env -\n" +
+            waitOutput(out, PROMPT + "/env \n" +
                             "-add-exports    -add-modules    -class-path     -module-path    \n" +
                             "\n" +
                             resource("jshell.console.see.synopsis") +
@@ -118,7 +122,7 @@
                             REDRAW_PROMPT + "/exit ");
             inputSink.write(INTERRUPT);
             inputSink.write("int zebraStripes = 11\n");
-            waitOutput(out, "zebraStripes ==> 11\n\u0005");
+            waitOutput(out, "\\u001B\\[\\?2004lzebraStripes ==> 11\n\\u001B\\[\\?2004h" + PROMPT);
             inputSink.write("/exit zeb" + TAB);
             waitOutput(out, "braStr.*es");
             inputSink.write(INTERRUPT + "/doesnotexist" + TAB);