--- old/test/compiler/whitebox/GetCodeHeapEntriesTest.java	2014-12-09 15:13:16.121781488 +0100
+++ new/test/compiler/whitebox/GetCodeHeapEntriesTest.java	2014-12-09 15:13:15.781781477 +0100
@@ -25,18 +25,18 @@
 import java.util.Arrays;
 import java.util.EnumSet;
 
-import sun.hotspot.WhiteBox;
-import sun.hotspot.code.CodeBlob;
-import sun.hotspot.code.BlobType;
+import jdk.testlib.WhiteBox;
+import jdk.testlib.code.CodeBlob;
+import jdk.testlib.code.BlobType;
 import com.oracle.java.testlibrary.Asserts;
 
 /*
  * @test GetCodeHeapEntriesTest
  * @bug 8059624
- * @library /testlibrary /testlibrary/whitebox
+ * @library /testlibrary /../../test/lib
  * @build GetCodeHeapEntriesTest
- * @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:-SegmentedCodeCache
  *                   GetCodeHeapEntriesTest