--- old/test/runtime/modules/Xpatch/XpatchJavaBase.java	2016-08-11 13:44:14.823998900 -0400
+++ new/test/runtime/modules/Xpatch/XpatchJavaBase.java	2016-08-11 13:44:14.407752500 -0400
@@ -26,12 +26,14 @@
  * @bug 8130399
  * @summary Make sure -Xpatch works for java.base.
  * @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
  * @compile XpatchMain.java
  * @run main XpatchJavaBase
  */
 
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.InMemoryJavaCompiler;
 
 public class XpatchJavaBase {