--- old/test/runtime/ClassUnload/KeepAliveClassLoader.java	2014-12-09 15:13:22.577781693 +0100
+++ new/test/runtime/ClassUnload/KeepAliveClassLoader.java	2014-12-09 15:13:22.221781681 +0100
@@ -24,16 +24,16 @@
 /*
  * @test KeepAliveClassLoader
  * @summary This test case uses a java.lang.ClassLoader instance to keep a class alive.
- * @library /testlibrary /testlibrary/whitebox /runtime/testlibrary
+ * @library /testlibrary /../../test/lib /runtime/testlibrary
  * @library classes
  * @build KeepAliveClassLoader test.Empty
  * @build ClassUnloadCommon
- * @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 KeepAliveClassLoader
  */
 
-import sun.hotspot.WhiteBox;
+import jdk.testlib.WhiteBox;
 
 /**
  * Test that verifies that classes are not unloaded when specific types of references are kept to them.