--- a/langtools/test/tools/javac/api/ToolProvider/ToolProviderTest.java	Tue Nov 22 07:04:43 2016 -0800
+++ b/langtools/test/tools/javac/api/ToolProvider/ToolProviderTest.java	Tue Nov 22 16:29:24 2016 -0800
@@ -55,6 +55,8 @@
 
         Objects.requireNonNull(ToolProvider.getSystemDocumentationTool());
         Objects.requireNonNull(ToolProvider.getSystemJavaCompiler());
-        Objects.requireNonNull(ToolProvider.getSystemToolClassLoader());
+        if (ToolProvider.getSystemToolClassLoader() != null) {
+            throw new AssertionError("unexpected value for getSystemToolClassLoader");
+        }
     }
 }