--- old/langtools/test/tools/javac/api/ToolProvider/ToolProviderTest1.java	2016-05-04 07:57:39.000000000 -0700
+++ new/langtools/test/tools/javac/api/ToolProvider/ToolProviderTest1.java	2016-05-04 07:57:39.000000000 -0700
@@ -43,7 +43,7 @@
 public class ToolProviderTest1 {
     public static void main(String... args) throws Exception {
         if (args.length > 0) {
-            System.err.println(Class.forName(args[0], true, null));
+            System.err.println(Class.forName(args[0], true, ClassLoader.getSystemClassLoader()));
             return;
         }