--- old/test/gc/whitebox/TestConcMarkCycleWB.java	2014-12-09 15:13:22.537781691 +0100
+++ new/test/gc/whitebox/TestConcMarkCycleWB.java	2014-12-09 15:13:22.185781680 +0100
@@ -25,16 +25,16 @@
  * @test TestConMarkCycleWB
  * @bug 8065579
  * @requires vm.gc=="null" | vm.gc=="G1"
- * @library /testlibrary /testlibrary/whitebox
- * @build ClassFileInstaller com.oracle.java.testlibrary.* sun.hotspot.WhiteBox TestConcMarkCycleWB
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @library /testlibrary /../../test/lib
+ * @build ClassFileInstaller com.oracle.java.testlibrary.* jdk.testlib.WhiteBox TestConcMarkCycleWB
+ * @run main ClassFileInstaller jdk.testlib.WhiteBox
+ *                              jdk.testlib.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UseG1GC TestConcMarkCycleWB
  * @summary Verifies that ConcurrentMarking-related WB works properly
  */
 import static com.oracle.java.testlibrary.Asserts.assertFalse;
 import static com.oracle.java.testlibrary.Asserts.assertTrue;
-import sun.hotspot.WhiteBox;
+import jdk.testlib.WhiteBox;
 
 public class TestConcMarkCycleWB {