--- a/langtools/test/jdk/jshell/ToolSimpleTest.java	Thu Jun 02 15:39:10 2016 -0400
+++ b/langtools/test/jdk/jshell/ToolSimpleTest.java	Thu Jun 02 12:52:00 2016 -0700
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8153716 8143955 8151754 8150382 8153920 8156910
+ * @bug 8153716 8143955 8151754 8150382 8153920 8156910 8131024
  * @summary Simple jshell tool tests
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.main
@@ -61,6 +61,16 @@
         );
     }
 
+    public void testOpenComment() {
+        test(
+                (a) -> assertCommand(a, "int z = /* blah", ""),
+                (a) -> assertCommand(a, "baz */ 5", "z ==> 5"),
+                (a) -> assertCommand(a, "/** hoge ", ""),
+                (a) -> assertCommand(a, "baz **/", ""),
+                (a) -> assertCommand(a, "int v", "v ==> 0")
+        );
+    }
+
     public void oneLineOfError() {
         test(
                 (a) -> assertCommand(a, "12+", null),