--- a/langtools/test/tools/javac/processing/TestMultipleErrors.java	Tue Dec 08 18:01:03 2015 +0530
+++ b/langtools/test/tools/javac/processing/TestMultipleErrors.java	Tue Dec 08 21:02:07 2015 +0100
@@ -1,29 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * @test
+ * @test /nodynamiccopyright
  * @bug 8066843
  * @summary Annotation processors should be able to print multiple errors at the same location.
  * @library /tools/javac/lib

--- a/langtools/test/tools/javac/processing/TestMultipleErrors.out	Tue Dec 08 18:01:03 2015 +0530
+++ b/langtools/test/tools/javac/processing/TestMultipleErrors.out	Tue Dec 08 21:02:07 2015 +0100
@@ -1,5 +1,5 @@
-TestMultipleErrors.java:42:8: compiler.err.proc.messager: error1
-TestMultipleErrors.java:42:8: compiler.err.proc.messager: error2
-TestMultipleErrors.java:42:8: compiler.err.proc.messager: error3
-TestMultipleErrors.java:42:8: compiler.err.proc.messager: error4
+TestMultipleErrors.java:18:8: compiler.err.proc.messager: error1
+TestMultipleErrors.java:18:8: compiler.err.proc.messager: error2
+TestMultipleErrors.java:18:8: compiler.err.proc.messager: error3
+TestMultipleErrors.java:18:8: compiler.err.proc.messager: error4
 4 errors