--- old/test/compiler/c2/6589834/Test_ia32.java	2014-12-09 15:12:59.789780970 +0100
+++ new/test/compiler/c2/6589834/Test_ia32.java	2014-12-09 15:12:59.385780957 +0100
@@ -26,11 +26,11 @@
  * @bug 6589834
  * @summary Safepoint placed between stack pointer increment and decrement leads
  *          to interpreter's stack corruption after deoptimization.
- * @library /testlibrary /testlibrary/whitebox
- * @build ClassFileInstaller sun.hotspot.WhiteBox com.oracle.java.testlibrary.*
+ * @library /testlibrary /../../test/lib
+ * @build ClassFileInstaller jdk.testlib.WhiteBox com.oracle.java.testlibrary.*
  *        Test_ia32 InlinedArrayCloneTestCase
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run main ClassFileInstaller jdk.testlib.WhiteBox
+ *                              jdk.testlib.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *      -XX:+WhiteBoxAPI -XX:CompileOnly=InlinedArrayCloneTestCase
  *      -XX:CompileCommand=dontinline,InlinedArrayCloneTestCase.invokeArrayClone
@@ -41,7 +41,7 @@
 import java.lang.reflect.Method;
 
 import com.oracle.java.testlibrary.Asserts;
-import sun.hotspot.WhiteBox;
+import jdk.testlib.WhiteBox;
 
 public class Test_ia32 {
     private static final int NUM_THREADS