--- old/test/compiler/types/correctness/CorrectnessTest.java	2014-12-09 15:13:14.053781422 +0100
+++ new/test/compiler/types/correctness/CorrectnessTest.java	2014-12-09 15:13:13.725781412 +0100
@@ -24,13 +24,13 @@
 /*
  * @test CorrectnessTest
  * @bug 8038418
- * @library /testlibrary /testlibrary/whitebox
+ * @library /testlibrary /../../test/lib
  * @ignore 8066173
  * @compile execution/TypeConflict.java execution/TypeProfile.java
  *          execution/MethodHandleDelegate.java
  * @build CorrectnessTest
- * @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:+IgnoreUnrecognizedVMOptions -XX:+UnlockExperimentalVMOptions
  *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                   -XX:TypeProfileLevel=222 -XX:+UseTypeSpeculation
@@ -60,7 +60,7 @@
 import execution.TypeProfile;
 import hierarchies.*;
 import scenarios.*;
-import sun.hotspot.WhiteBox;
+import jdk.testlib.WhiteBox;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;