diff -r 8e89d567748c -r c449daa25b45 langtools/test/jdk/jshell/ToolFormatTest.java
--- a/langtools/test/jdk/jshell/ToolFormatTest.java	Fri May 20 09:47:00 2016 -0700
+++ b/langtools/test/jdk/jshell/ToolFormatTest.java	Fri May 20 11:55:46 2016 -0700
@@ -220,7 +220,7 @@
                     (a) -> assertCommandOutputStartsWith(a, "/set feedback te",
                             ""),
                     (a) -> assertCommandOutputStartsWith(a, "/set ",
-                            "ERROR: The '/set' command requires a sub-command and arguments"),
+                            "ERROR: The '/set' command requires a sub-command"),
                     (a) -> assertCommandOutputStartsWith(a, "/set xyz",
                             "ERROR: Invalid '/set' argument: xyz"),
                     (a) -> assertCommandOutputStartsWith(a, "/set f",