--- old/test/tools/javac/StringConcat/access/Test.java	2016-03-09 17:05:50.804470707 +0300
+++ new/test/tools/javac/StringConcat/access/Test.java	2016-03-09 17:05:50.748470977 +0300
@@ -21,24 +21,28 @@
  * questions.
  */
 
+import com.sun.tools.classfile.*;
+import com.sun.tools.classfile.ConstantPool.*;
+
+import java.io.File;
+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
  */
 
-import com.sun.tools.classfile.*;
-import com.sun.tools.classfile.ConstantPool.*;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
 public class Test {
     static List<String> actualTypes;