--- old/test/runtime/modules/Xpatch/XpatchTestJar.java	2016-08-11 13:44:19.713275000 -0400
+++ new/test/runtime/modules/Xpatch/XpatchTestJar.java	2016-08-11 13:44:19.306761700 -0400
@@ -24,15 +24,16 @@
 /*
  * @test
  * @summary Make sure -Xpatch works when a jar file is specified for a module
- * @library /testlibrary
+ * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          jdk.jartool/sun.tools.jar
- * @build BasicJarBuilder
  * @compile XpatchMain.java
  * @run main XpatchTestJar
  */
 
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.InMemoryJavaCompiler;
 
 public class XpatchTestJar {
     private static String moduleJar;