--- old/test/runtime/modules/Xpatch/XpatchTestJarDir.java	2016-08-11 13:44:22.168952300 -0400
+++ new/test/runtime/modules/Xpatch/XpatchTestJarDir.java	2016-08-11 13:44:21.761598100 -0400
@@ -24,17 +24,18 @@
 /*
  * @test
  * @summary Make sure -Xpatch works when a jar file and a directory is specified for a module
- * @library /testlibrary
+ * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          jdk.jartool/sun.tools.jar
- * @build BasicJarBuilder
  * @compile Xpatch2DirsMain.java
  * @run main XpatchTestJarDir
  */
 
 import java.io.File;
 import java.nio.file.Files;
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.InMemoryJavaCompiler;
 
 public class XpatchTestJarDir {
     private static String moduleJar;