--- old/test/runtime/ClassUnload/UnloadTest.java	2014-12-09 15:13:22.601781694 +0100
+++ new/test/runtime/ClassUnload/UnloadTest.java	2014-12-09 15:13:22.209781681 +0100
@@ -23,15 +23,15 @@
 
 /*
  * @test UnloadTest
- * @library /runtime/testlibrary /testlibrary /testlibrary/whitebox
+ * @library /runtime/testlibrary /testlibrary /../../test/lib
  * @library classes
  * @build ClassUnloadCommon test.Empty
  * @build UnloadTest
- * @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:. -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI UnloadTest
  */
-import sun.hotspot.WhiteBox;
+import jdk.testlib.WhiteBox;
 
 /**
  * Test that verifies that classes are unloaded when they are no longer reachable.