diff -r 514bf0744294 -r ed82623d7831 hotspot/test/runtime/modules/PatchModule/PatchModuleDupJavaBase.java
--- a/hotspot/test/runtime/modules/PatchModule/PatchModuleDupJavaBase.java	Fri Aug 19 01:20:39 2016 -0400
+++ b/hotspot/test/runtime/modules/PatchModule/PatchModuleDupJavaBase.java	Fri Aug 19 10:06:30 2016 -0400
@@ -25,10 +25,11 @@
  * @test
  * @summary VM exit initialization results if java.base is specificed more than once to --patch-module.
  * @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
  */
 
-import jdk.test.lib.*;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
 
 public class PatchModuleDupJavaBase {
   // The VM should exit initialization if java.base is specified