--- old/test/runtime/ClassUnload/KeepAliveSoftReference.java	2014-12-09 15:13:22.537781691 +0100
+++ new/test/runtime/ClassUnload/KeepAliveSoftReference.java	2014-12-09 15:13:22.213781681 +0100
@@ -24,17 +24,17 @@
 /*
  * @test KeepAliveSoftReference
  * @summary This test case uses a java.lang.ref.SoftReference referencing a class instance to keep a class alive.
- * @library /testlibrary /testlibrary/whitebox /runtime/testlibrary
+ * @library /testlibrary /../../test/lib /runtime/testlibrary
  * @library classes
  * @build KeepAliveSoftReference 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 KeepAliveSoftReference
  */
 
 import java.lang.ref.SoftReference;
-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.