--- old/test/runtime/modules/Xpatch/XpatchTraceCL.java	2016-08-11 13:44:24.632088100 -0400
+++ new/test/runtime/modules/Xpatch/XpatchTraceCL.java	2016-08-11 13:44:24.220692300 -0400
@@ -27,13 +27,15 @@
  * @summary Make sure -Xlog:classload=info works properly with "modules" jimage,
             -Xpatch, and with -Xbootclasspath/a
  * @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
  * @compile XpatchMain.java
  * @run main XpatchTraceCL
  */
 
 import java.io.File;
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.InMemoryJavaCompiler;
 
 public class XpatchTraceCL {