--- old/test/runtime/ErrorHandling/ErrorHandler.java	2016-08-11 13:35:27.902821800 -0400
+++ new/test/runtime/ErrorHandling/ErrorHandler.java	2016-08-11 13:35:27.490233600 -0400
@@ -28,11 +28,13 @@
  * @summary Exercise HotSpot error handling code by invoking java with
  *          -XX:ErrorHandlerTest option to cause an error report. Check the results.
  * @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
  * @run driver ErrorHandler
  */
 
-import jdk.test.lib.*;
+import jdk.test.lib.Platform;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
 
 public class ErrorHandler {