--- old/test/compiler/intrinsics/classcast/NullCheckDroppingsTest.java	2014-12-09 15:13:03.085781074 +0100
+++ new/test/compiler/intrinsics/classcast/NullCheckDroppingsTest.java	2014-12-09 15:13:02.757781064 +0100
@@ -25,18 +25,18 @@
  * @test NullCheckDroppingsTest
  * @bug 8054492
  * @summary "Casting can result in redundant null checks in generated code"
- * @library /testlibrary /testlibrary/whitebox /testlibrary/com/oracle/java/testlibrary
+ * @library /testlibrary /../../test/lib /testlibrary/com/oracle/java/testlibrary
  * @build NullCheckDroppingsTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run main ClassFileInstaller jdk.testlib.WhiteBox
+ *                              jdk.testlib.WhiteBox$WhiteBoxPermission
  * @run main ClassFileInstaller com.oracle.java.testlibrary.Platform
  * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                   -Xmixed -XX:-BackgroundCompilation -XX:-TieredCompilation -XX:CompileThreshold=1000
  *                   -XX:CompileCommand=exclude,NullCheckDroppingsTest::runTest NullCheckDroppingsTest
  */
 
-import sun.hotspot.WhiteBox;
-import sun.hotspot.code.NMethod;
+import jdk.testlib.WhiteBox;
+import jdk.testlib.code.NMethod;
 import com.oracle.java.testlibrary.Platform;
 
 import java.lang.reflect.Method;