--- old/test/compiler/compilercontrol/InlineMatcherTest.java	2015-11-23 17:27:38.000000000 +0300
+++ new/test/compiler/compilercontrol/InlineMatcherTest.java	2015-11-23 17:27:37.000000000 +0300
@@ -24,7 +24,8 @@
 /*
  * @test InlineMatcherTest
  * @bug 8074095
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
+ * @build sun.hotspot.WhiteBox
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI InlineMatcherTest
--- old/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityBase.java	2015-11-23 17:27:38.000000000 +0300
+++ new/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityBase.java	2015-11-23 17:27:38.000000000 +0300
@@ -30,7 +30,7 @@
  *          java.management
  * @build jdk.test.lib.*
  * @build jdk.test.lib.dcmd.*
- * @build sun.hotspot.WhiteBox.*
+ * @build sun.hotspot.WhiteBox
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run testng/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI TestCompilerDirectivesCompatibilityBase
--- old/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOff.java	2015-11-23 17:27:39.000000000 +0300
+++ new/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOff.java	2015-11-23 17:27:39.000000000 +0300
@@ -30,7 +30,7 @@
  *          java.management
  * @build jdk.test.lib.*
  * @build jdk.test.lib.dcmd.*
- * @build sun.hotspot.WhiteBox.*
+ * @build sun.hotspot.WhiteBox
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run testng/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- old/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOn.java	2015-11-23 17:27:40.000000000 +0300
+++ new/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOn.java	2015-11-23 17:27:40.000000000 +0300
@@ -30,7 +30,7 @@
  *          java.management
  * @build jdk.test.lib.*
  * @build jdk.test.lib.dcmd.*
- * @build sun.hotspot.WhiteBox.*
+ * @build sun.hotspot.WhiteBox
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run testng/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- old/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityFlag.java	2015-11-23 17:27:41.000000000 +0300
+++ new/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityFlag.java	2015-11-23 17:27:41.000000000 +0300
@@ -30,7 +30,7 @@
  *          java.management
  * @build jdk.test.lib.*
  * @build jdk.test.lib.dcmd.*
- * @build sun.hotspot.WhiteBox.*
+ * @build sun.hotspot.WhiteBox
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run testng/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions