--- a/langtools/test/tools/javac/proprietary/WarnImport.java	Wed Jul 05 21:11:02 2017 +0200
+++ b/langtools/test/tools/javac/proprietary/WarnImport.java	Wed Jan 06 10:01:34 2016 +0000
@@ -9,6 +9,6 @@
  * @compile/fail/ref=WarnImport.out -XDrawDiagnostics  -Werror -Xlint:none WarnImport.java
  */
 
-import sun.misc.VM;
+import sun.security.x509.X509CertInfo;
 
 public class WarnImport {}

--- a/langtools/test/tools/javac/proprietary/WarnImport.out	Wed Jul 05 21:11:02 2017 +0200
+++ b/langtools/test/tools/javac/proprietary/WarnImport.out	Wed Jan 06 10:01:34 2016 +0000
@@ -1,4 +1,4 @@
-WarnImport.java:12:16: compiler.warn.sun.proprietary: sun.misc.VM
+WarnImport.java:12:25: compiler.warn.sun.proprietary: sun.security.x509.X509CertInfo
 - compiler.err.warnings.and.werror
 1 error
 1 warning

--- a/langtools/test/tools/javac/proprietary/WarnMethod.java	Wed Jul 05 21:11:02 2017 +0200
+++ b/langtools/test/tools/javac/proprietary/WarnMethod.java	Wed Jan 06 10:01:34 2016 +0000
@@ -3,7 +3,7 @@
  * @bug     6380059
  * @summary Emit warnings for proprietary packages in the boot class path
  * @author  Peter von der Ah\u00e9
- * @modules java.base/sun.misc
+ * @modules java.base/sun.security.x509
  * @compile WarnMethod.java
  * @compile/fail/ref=WarnMethod.out -XDrawDiagnostics  -Werror WarnMethod.java
  * @compile/fail/ref=WarnMethod.out -XDrawDiagnostics  -Werror -nowarn WarnMethod.java
@@ -12,6 +12,6 @@
 
 public class WarnMethod {
     public static void main(String... args) {
-        System.out.println(sun.misc.VM.getFinalRefCount());
+        System.out.println(sun.security.x509.OIDMap.getOID(""));
     }
 }

--- a/langtools/test/tools/javac/proprietary/WarnMethod.out	Wed Jul 05 21:11:02 2017 +0200
+++ b/langtools/test/tools/javac/proprietary/WarnMethod.out	Wed Jan 06 10:01:34 2016 +0000
@@ -1,4 +1,4 @@
-WarnMethod.java:15:36: compiler.warn.sun.proprietary: sun.misc.VM
+WarnMethod.java:15:45: compiler.warn.sun.proprietary: sun.security.x509.OIDMap
 - compiler.err.warnings.and.werror
 1 error
 1 warning

--- a/langtools/test/tools/javac/proprietary/WarnStaticImport.java	Wed Jul 05 21:11:02 2017 +0200
+++ b/langtools/test/tools/javac/proprietary/WarnStaticImport.java	Wed Jan 06 10:01:34 2016 +0000
@@ -9,6 +9,6 @@
  * @compile/fail/ref=WarnStaticImport.out -XDrawDiagnostics  -Werror -Xlint:none WarnStaticImport.java
  */
 
-import static sun.misc.VM.getFinalRefCount;
+import static sun.security.x509.OIDMap.getOID;
 
 public class WarnStaticImport {}

--- a/langtools/test/tools/javac/proprietary/WarnStaticImport.out	Wed Jul 05 21:11:02 2017 +0200
+++ b/langtools/test/tools/javac/proprietary/WarnStaticImport.out	Wed Jan 06 10:01:34 2016 +0000
@@ -1,4 +1,4 @@
-WarnStaticImport.java:12:23: compiler.warn.sun.proprietary: sun.misc.VM
+WarnStaticImport.java:12:32: compiler.warn.sun.proprietary: sun.security.x509.OIDMap
 - compiler.err.warnings.and.werror
 1 error
 1 warning