--- old/test/compiler/intrinsics/sha/sanity/TestSHA1MultiBlockIntrinsics.java	2016-07-06 19:17:30.251387939 +0300
+++ new/test/compiler/intrinsics/sha/sanity/TestSHA1MultiBlockIntrinsics.java	2016-07-06 19:17:30.171387937 +0300
@@ -25,10 +25,12 @@
  * @test
  * @bug 8035968
  * @summary Verify that SHA-1 multi block intrinsic is actually used.
- * @library /testlibrary /test/lib / ../
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @build TestSHA compiler.testlibrary.intrinsics.Verifier TestSHA1MultiBlockIntrinsics
+ *
+ * @build compiler.testlibrary.intrinsics.Verifier
+ *        compiler.intrinsics.sha.sanity.TestSHA1MultiBlockIntrinsics
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
@@ -39,7 +41,8 @@
  *                   -XX:CompileOnly=sun/security/provider/SHA
  *                   -XX:+UseSHA1Intrinsics -XX:-UseSHA256Intrinsics
  *                   -XX:-UseSHA512Intrinsics
- *                   -Dalgorithm=SHA-1 TestSHA1MultiBlockIntrinsics
+ *                   -Dalgorithm=SHA-1
+ *                   compiler.intrinsics.sha.sanity.TestSHA1MultiBlockIntrinsics
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500
  *                   -XX:Tier4InvocationThreshold=500
@@ -47,19 +50,21 @@
  *                   -XX:CompileOnly=sun/security/provider/DigestBase
  *                   -XX:CompileOnly=sun/security/provider/SHA
  *                   -XX:+UseSHA1Intrinsics -Dalgorithm=SHA-1
- *                   TestSHA1MultiBlockIntrinsics
+ *                   compiler.intrinsics.sha.sanity.TestSHA1MultiBlockIntrinsics
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500
  *                   -XX:Tier4InvocationThreshold=500
  *                   -XX:+LogCompilation -XX:LogFile=negative.log
  *                   -XX:CompileOnly=sun/security/provider/DigestBase
  *                   -XX:CompileOnly=sun/security/provider/SHA -XX:-UseSHA
- *                   -Dalgorithm=SHA-1 TestSHA1MultiBlockIntrinsics
+ *                   -Dalgorithm=SHA-1
+ *                   compiler.intrinsics.sha.sanity.TestSHA1MultiBlockIntrinsics
  * @run main/othervm -DverificationStrategy=VERIFY_INTRINSIC_USAGE
  *                   compiler.testlibrary.intrinsics.Verifier positive.log positive_def.log
  *                   negative.log
  */
 
+package compiler.intrinsics.sha.sanity;
 import compiler.testlibrary.sha.predicate.IntrinsicPredicates;
 
 public class TestSHA1MultiBlockIntrinsics {