--- a/test/tools/jdeps/APIDeps.java	Fri Nov 20 16:52:19 2015 -0800
+++ b/test/tools/jdeps/APIDeps.java	Mon Nov 23 22:02:34 2015 -0800
@@ -83,7 +83,7 @@
         // -jdkinternals parses all classes on -classpath and the input arguments
         test(new File(mDir, "Gee.class"),
              new String[] {"com.sun.tools.jdeps.Main", "com.sun.tools.classfile.ClassFile",
-                           "sun.security.x509.X509CertInfo", "sun.misc.Unsafe"},
+                           "sun.security.x509.X509CertInfo"},
              new String[] {"JDK internal API"},
              new String[] {"-classpath", testDir.getPath(), "-jdkinternals"});
 

--- a/test/tools/jdeps/VerboseFormat/JdepsDependencyClosure.java	Fri Nov 20 16:52:19 2015 -0800
+++ b/test/tools/jdeps/VerboseFormat/JdepsDependencyClosure.java	Mon Nov 23 22:02:34 2015 -0800
@@ -44,7 +44,7 @@
  *          are found within the same archive. For each testcase, compare the
  *          result obtained from jdeps with the expected result.
  * @modules jdk.jdeps/com.sun.tools.jdeps
- *          java.base/sun.net
+ *          java.base/sun.security.x509
  * @build use.indirect.DontUseJdkInternal2
  * @build use.indirect.UseJdkInternalIndirectly
  * @build use.indirect2.DontUseJdkInternal3
@@ -189,12 +189,12 @@
             {"use.internal.UseJdkInternalClass", "use.internal.UseJdkInternalClass2"}
         };
         String[][] dependencies = new String[][] {
-            {"sun.net.ProgressMonitor"}
+            {"sun.security.x509.X509CertInfo"}
         };
         String[][] archive = new String[][] {
             {arcName, arcPath, "JDK internal API (java.base)", "java.base"},
         };
-        return TestCaseData.make("sun.net.ProgressMonitor", arcPath, classes,
+        return TestCaseData.make("sun.security.x509.X509CertInfo", arcPath, classes,
                 dependencies, archive, false);
     }
 
@@ -227,7 +227,7 @@
             {"use.indirect.UseJdkInternalIndirectly"}
         };
         final String[][] dependencies = new String[][] {
-            {"sun.net.ProgressMonitor"},
+            {"sun.security.x509.X509CertInfo"},
             {"use.internal.UseJdkInternalClass"},
             {"use.internal.UseClassWithJdkInternal"}
         };
@@ -236,7 +236,7 @@
             {arcName, arcPath, arcName, arcPath},
             {arcName, arcPath, arcName, arcPath}
         };
-        return TestCaseData.make("sun.net.ProgressMonitor", arcPath, classes, dependencies,
+        return TestCaseData.make("sun.security.x509.X509CertInfo", arcPath, classes, dependencies,
                 archives, true);
     }
 

--- a/test/tools/jdeps/VerboseFormat/use/internal/UseJdkInternalClass.java	Fri Nov 20 16:52:19 2015 -0800
+++ b/test/tools/jdeps/VerboseFormat/use/internal/UseJdkInternalClass.java	Mon Nov 23 22:02:34 2015 -0800
@@ -22,9 +22,9 @@
  */
 package use.internal;
 
-import sun.net.ProgressMonitor;
+import sun.security.x509.X509CertInfo;
 
 public class UseJdkInternalClass {
-    static ProgressMonitor monitor = ProgressMonitor.getDefault();
+    static X509CertInfo cert = new X509CertInfo();
 
 }

--- a/test/tools/jdeps/VerboseFormat/use/internal/UseJdkInternalClass2.java	Fri Nov 20 16:52:19 2015 -0800
+++ b/test/tools/jdeps/VerboseFormat/use/internal/UseJdkInternalClass2.java	Mon Nov 23 22:02:34 2015 -0800
@@ -22,9 +22,9 @@
  */
 package use.internal;
 
-import sun.net.ProgressMonitor;
+import sun.security.x509.X509CertInfo;
 
 public class UseJdkInternalClass2 {
-    static ProgressMonitor monitor = ProgressMonitor.getDefault();
+    static X509CertInfo cert = new X509CertInfo();
 
 }

--- a/test/tools/jdeps/f/F.java	Fri Nov 20 16:52:19 2015 -0800
+++ b/test/tools/jdeps/f/F.java	Mon Nov 23 22:02:34 2015 -0800
@@ -23,9 +23,12 @@
 
 package f;
 
+import sun.security.x509.X509CertInfo;
+
 public class F {
+    private final X509CertInfo cert;
     public F() {
         // jdk internal API
-        sun.net.ProgressMonitor.getDefault();
+        cert = new X509CertInfo();
     }
 }