--- old/test/runtime/modules/Xpatch/XpatchDupModule.java	2016-08-11 13:44:12.378901500 -0400
+++ new/test/runtime/modules/Xpatch/XpatchDupModule.java	2016-08-11 13:44:11.972803100 -0400
@@ -25,10 +25,11 @@
  * @test
  * @summary Module system initialization exception results if a module is specificed twice to Xpatch.
  * @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
  */
 
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
 
 public class XpatchDupModule {