--- old/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnUnsupportedCPU.java	2016-08-11 13:10:21.906553500 -0400
+++ new/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnUnsupportedCPU.java	2016-08-11 13:10:21.483215500 -0400
@@ -26,11 +26,11 @@
  * @bug 8031321
  * @summary Verify processing of UseCountTrailingZerosInstruction option
  *          on CPU without TZCNT instruction (BMI1 feature) support.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  *
- * @build compiler.arguments.TestUseCountTrailingZerosInstructionOnUnsupportedCPU
+ * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions