--- old/test/compiler/whitebox/ForceNMethodSweepTest.java	2014-12-09 15:13:16.085781487 +0100
+++ new/test/compiler/whitebox/ForceNMethodSweepTest.java	2014-12-09 15:13:15.741781476 +0100
@@ -25,8 +25,8 @@
 import java.lang.reflect.Method;
 import java.util.EnumSet;
 
-import sun.hotspot.WhiteBox;
-import sun.hotspot.code.BlobType;
+import jdk.testlib.WhiteBox;
+import jdk.testlib.code.BlobType;
 
 import com.oracle.java.testlibrary.Asserts;
 import com.oracle.java.testlibrary.InfiniteLoop;
@@ -34,10 +34,10 @@
 /*
  * @test
  * @bug 8059624 8064669
- * @library /testlibrary /testlibrary/whitebox
+ * @library /testlibrary /../../test/lib
  * @build ForceNMethodSweepTest
- * @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:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:-TieredCompilation -XX:+WhiteBoxAPI
  *                   -XX:CompileCommand=compileonly,SimpleTestCase$Helper::*