--- old/test/runtime/ErrorHandling/SafeFetchInErrorHandlingTest.java	2016-08-11 13:35:32.817946100 -0400
+++ new/test/runtime/ErrorHandling/SafeFetchInErrorHandlingTest.java	2016-08-11 13:35:32.410736500 -0400
@@ -27,16 +27,16 @@
 import java.io.InputStreamReader;
 import java.util.regex.Pattern;
 
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.Platform;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.ProcessTools;
 
 /*
  * @test
  * @bug 8074552
  * @summary SafeFetch32 and SafeFetchN do not work in error handling
  * @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
  * @author Thomas Stuefe (SAP)
  */