--- a/langtools/test/tools/javac/StringConcat/access/Test.java	Wed Mar 09 12:52:14 2016 +0300
+++ b/langtools/test/tools/javac/StringConcat/access/Test.java	Wed Mar 09 18:31:49 2016 +0300
@@ -21,17 +21,6 @@
  * questions.
  */
 
-/*
- * @test
- * @bug     8151223
- * @summary String concatenation fails with implicit toString() on package-private class
- * @modules jdk.jdeps/com.sun.tools.classfile
- * @compile -XDstringConcat=indy              Holder.java PublicClass.java PublicInterface.java Public_PublicClass.java Public_PublicInterface.java Public_PrivateInterface1.java Public_PrivateInterface2.java Test.java
- * @run main Test
- * @compile -XDstringConcat=indyWithConstants Holder.java PublicClass.java PublicInterface.java Public_PublicClass.java Public_PublicInterface.java Public_PrivateInterface1.java Public_PrivateInterface2.java Test.java
- * @run main Test
- */
-
 import com.sun.tools.classfile.*;
 import com.sun.tools.classfile.ConstantPool.*;
 
@@ -39,6 +28,21 @@
 import java.util.ArrayList;
 import java.util.List;
 
+/*
+ * @test
+ * @bug     8151223
+ * @summary String concatenation fails with implicit toString() on package-private class
+ * @modules jdk.jdeps/com.sun.tools.classfile
+ *
+ * @clean *
+ * @compile -XDstringConcat=indy              Holder.java PublicClass.java PublicInterface.java Public_PublicClass.java Public_PublicInterface.java Public_PrivateInterface1.java Public_PrivateInterface2.java Test.java
+ * @run main Test
+ *
+ * @clean *
+ * @compile -XDstringConcat=indyWithConstants Holder.java PublicClass.java PublicInterface.java Public_PublicClass.java Public_PublicInterface.java Public_PrivateInterface1.java Public_PrivateInterface2.java Test.java
+ * @run main Test
+ */
+
 public class Test {
     static List<String> actualTypes;