--- old/test/gc/class_unloading/TestG1ClassUnloadingHWM.java	2014-12-09 15:13:18.237781555 +0100
+++ new/test/gc/class_unloading/TestG1ClassUnloadingHWM.java	2014-12-09 15:13:17.885781544 +0100
@@ -25,10 +25,10 @@
  * @test
  * @key gc
  * @bug 8049831
- * @library /testlibrary /testlibrary/whitebox
+ * @library /testlibrary /../../test/lib
  * @build TestG1ClassUnloadingHWM
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run main ClassFileInstaller jdk.testlib.WhiteBox
+ *                              jdk.testlib.WhiteBox$WhiteBoxPermission
  * @run driver TestG1ClassUnloadingHWM
  * @summary Test that -XX:-ClassUnloadingWithConcurrentMark will trigger a Full GC when more than MetaspaceSize metadata is allocated.
  */
@@ -37,7 +37,7 @@
 import com.oracle.java.testlibrary.ProcessTools;
 import java.util.ArrayList;
 import java.util.Arrays;
-import sun.hotspot.WhiteBox;
+import jdk.testlib.WhiteBox;
 
 public class TestG1ClassUnloadingHWM {
   private static long MetaspaceSize = 32 * 1024 * 1024;