--- old/test/runtime/modules/Xpatch/XpatchDupJavaBase.java	2016-08-11 13:44:09.929282500 -0400
+++ new/test/runtime/modules/Xpatch/XpatchDupJavaBase.java	2016-08-11 13:44:09.521794500 -0400
@@ -25,10 +25,11 @@
  * @test
  * @summary VM exit initialization results if java.base is specificed more than once 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 XpatchDupJavaBase {
   // The VM should exit initialization if java.base is specified