--- old/test/compiler/intrinsics/bmi/TestLzcntI.java	2016-07-06 19:17:01.559387088 +0300
+++ new/test/compiler/intrinsics/bmi/TestLzcntI.java	2016-07-06 19:17:01.479387086 +0300
@@ -27,16 +27,20 @@
  * @bug 8031321
  * @summary Verify that results of computations are the same w/
  *          and w/o usage of intrinsic
- * @library /testlibrary /test/lib
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @build TestLzcntI BMITestRunner Expr
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ *
+ * @build compiler.intrinsics.bmi.TestLzcntI
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
- *                   -XX:+WhiteBoxAPI TestLzcntI
+ *                   -XX:+WhiteBoxAPI
+ *                   compiler.intrinsics.bmi.TestLzcntI
  */
 
+package compiler.intrinsics.bmi;
+
 import sun.hotspot.cpuinfo.CPUInfo;
 
 public class TestLzcntI {