--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/TaskFactory.java	Thu May 19 11:01:26 2016 -0700
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/TaskFactory.java	Thu May 19 11:56:38 2016 -0700
@@ -61,7 +61,7 @@
 import javax.tools.FileObject;
 import jdk.jshell.MemoryFileManager.SourceMemoryJavaFileObject;
 import jdk.jshell.ClassTracker.ClassInfo;
-import jdk.Version;
+import java.lang.Runtime.Version;
 
 /**
  * The primary interface to the compiler API.  Parsing, analysis, and

--- a/langtools/test/tools/javac/file/MultiReleaseJar/MultiReleaseJarAwareSJFM.java	Thu May 19 11:01:26 2016 -0700
+++ b/langtools/test/tools/javac/file/MultiReleaseJar/MultiReleaseJarAwareSJFM.java	Thu May 19 11:56:38 2016 -0700
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8149757
+ * @bug 8149757 8144062
  * @summary Test that StandardJavaFileManager uses the correct version of a
  * class from a multi-release jar on classpath
  * @library /tools/lib
@@ -164,7 +164,7 @@
                 {"", 8},
                 {"8", 8},
                 {"9", 9},
-                {"runtime", jdk.Version.current().major()}
+                {"runtime", Runtime.version().major()}
         };
     }