--- old/test/testlibrary/ctw/test/ClassesDirTest.java	2014-12-09 15:13:25.949781800 +0100
+++ new/test/testlibrary/ctw/test/ClassesDirTest.java	2014-12-09 15:13:25.633781790 +0100
@@ -24,10 +24,10 @@
 /*
  * @test
  * @bug 8012447
- * @library /testlibrary /testlibrary/whitebox /testlibrary/ctw/src
- * @build ClassFileInstaller sun.hotspot.tools.ctw.CompileTheWorld sun.hotspot.WhiteBox Foo Bar
- * @run main ClassFileInstaller sun.hotspot.WhiteBox Foo Bar
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @library /testlibrary /../../test/lib /testlibrary/ctw/src
+ * @build ClassFileInstaller sun.hotspot.tools.ctw.CompileTheWorld jdk.testlib.WhiteBox Foo Bar
+ * @run main ClassFileInstaller jdk.testlib.WhiteBox Foo Bar
+ *                              jdk.testlib.WhiteBox$WhiteBoxPermission
  * @run main ClassesDirTest prepare
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Dsun.hotspot.tools.ctw.logfile=ctw.log sun.hotspot.tools.ctw.CompileTheWorld classes
  * @run main ClassesDirTest check ctw.log