--- old/test/langtools/jdk/jshell/ClassesTest.java	2018-04-30 00:50:14.682716247 -0400
+++ new/test/langtools/jdk/jshell/ClassesTest.java	2018-04-30 00:50:13.142627166 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8145239 8129559 8080354 8189248
+ * @bug 8145239 8129559 8080354 8189248 8010319
  * @summary Tests for EvaluationState.classes
  * @build KullaTesting TestingInputStream ExpectedDiagnostic
  * @run testng ClassesTest
@@ -308,7 +308,7 @@
     public void testInnerClassesCrash() {
         Snippet a = classKey(assertEval("class A { class B extends A {} }"));
         Snippet a2 = classKey(assertEval("class A { interface I1 extends I2 {} interface I2 {} }",
-                ste(MAIN_SNIPPET, VALID, VALID, false, null),
+                ste(MAIN_SNIPPET, VALID, VALID, true, null),
                 ste(a, VALID, OVERWRITTEN, false, MAIN_SNIPPET)));
         assertEval("class A { A a = new A() {}; }",
                 ste(MAIN_SNIPPET, VALID, VALID, true, null),
--- old/test/langtools/jdk/jshell/ForwardReferenceTest.java	2018-04-30 00:50:18.934962204 -0400
+++ new/test/langtools/jdk/jshell/ForwardReferenceTest.java	2018-04-30 00:50:17.378872197 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 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
@@ -22,7 +22,7 @@
  */
 
 /*
- * @test 8173232
+ * @test 8173232 8010319
  * @summary Test of forward referencing of snippets.
  * @build KullaTesting TestingInputStream
  * @run testng ForwardReferenceTest
@@ -315,7 +315,7 @@
         Snippet f = methodKey(assertEval("void f() { class A {} g(); }", added(RECOVERABLE_DEFINED)));
         assertEval("void g() {}",
                 added(VALID),
-                ste(f, RECOVERABLE_DEFINED, VALID, false, null));
+                ste(f, RECOVERABLE_DEFINED, VALID, true, null));
         assertEval("f();", "");
     }
 }
--- old/test/langtools/jdk/jshell/GetResourceTest.java	2018-04-30 00:50:23.159206541 -0400
+++ new/test/langtools/jdk/jshell/GetResourceTest.java	2018-04-30 00:50:21.623117691 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8179531
+ * @bug 8179531 8010319
  * @summary Check that ClassLoader.getResource works as expected in the JShell agent.
  * @modules jdk.jshell
  * @build KullaTesting TestingInputStream
@@ -80,7 +80,7 @@
                    null,
                    DiagCheck.DIAG_OK,
                    DiagCheck.DIAG_OK,
-                   ste(MAIN_SNIPPET, VALID, VALID, false, null),
+                   ste(MAIN_SNIPPET, VALID, VALID, true, null),
                    ste(testMethod, VALID, OVERWRITTEN, false, MAIN_SNIPPET));
         assertEval("test()", "true");
     }