diff -r 514bf0744294 -r ed82623d7831 hotspot/test/runtime/modules/Visibility/PatchModuleVisibility.java
--- a/hotspot/test/runtime/modules/Visibility/PatchModuleVisibility.java	Fri Aug 19 01:20:39 2016 -0400
+++ b/hotspot/test/runtime/modules/Visibility/PatchModuleVisibility.java	Fri Aug 19 10:06:30 2016 -0400
@@ -26,7 +26,7 @@
  * @summary Ensure that a newly introduced java.base package placed within the --patch-module
  *          directory is considered part of the boot loader's visibility boundary
  * @requires !(os.family == "windows")
- * @library /testlibrary
+ * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main/othervm PatchModuleVisibility
@@ -36,7 +36,9 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 
-import jdk.test.lib.*;
+import jdk.test.lib.InMemoryJavaCompiler;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
 
 public class PatchModuleVisibility {