diff --git a/jdk/test/java/lang/Class/GetModuleTest.java b/jdk/test/java/lang/Class/GetModuleTest.java
index 918e4dd9dd1328e85ecef15c9e7d70475c75b4e2..359f7ca2ff76ec11c4801ff085e373e26d3d6029 100644
--- a/jdk/test/java/lang/Class/GetModuleTest.java
+++ b/jdk/test/java/lang/Class/GetModuleTest.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/jdk/test/java/lang/Class/GetPackageTest.java b/jdk/test/java/lang/Class/GetPackageTest.java
index f9cb5fb31ff94e0cc76b165f06cbed919d040ab0..5f6c96f0d447af0ba3cb9d75830106d50dd68a89 100644
--- a/jdk/test/java/lang/Class/GetPackageTest.java
+++ b/jdk/test/java/lang/Class/GetPackageTest.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/jdk/test/java/lang/ClassLoader/GetSystemPackage.java b/jdk/test/java/lang/ClassLoader/GetSystemPackage.java
index fba5648f5f45dd97fe70df73a263844b4d8a84aa..56152b5907ffe0b37b14e15adf34d62d0681e429 100644
--- a/jdk/test/java/lang/ClassLoader/GetSystemPackage.java
+++ b/jdk/test/java/lang/ClassLoader/GetSystemPackage.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
diff --git a/jdk/test/java/lang/ClassLoader/deadlock/GetResource.java b/jdk/test/java/lang/ClassLoader/deadlock/GetResource.java
index 26fbe3dd586664342a46df2c2ffc57da9a5f5f92..691c509e2e9f9cdfaa5eb41717114faeabb45743 100644
--- a/jdk/test/java/lang/ClassLoader/deadlock/GetResource.java
+++ b/jdk/test/java/lang/ClassLoader/deadlock/GetResource.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
diff --git a/jdk/test/java/lang/ProcessBuilder/CloseRace.java b/jdk/test/java/lang/ProcessBuilder/CloseRace.java
index a9afbd2ba915ba28f4d7356dd037bbec65483a03..1fa6d8d5e1562d19313d924d474095782af87e7e 100644
--- a/jdk/test/java/lang/ProcessBuilder/CloseRace.java
+++ b/jdk/test/java/lang/ProcessBuilder/CloseRace.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, 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
diff --git a/jdk/test/java/lang/ProcessBuilder/PipelineTest.java b/jdk/test/java/lang/ProcessBuilder/PipelineTest.java
index 9f6ec99fb7045628358fd880b4e08f69607f2a91..90b277ad9eb059eca6984d36a5ce19a0ef488353 100644
--- a/jdk/test/java/lang/ProcessBuilder/PipelineTest.java
+++ b/jdk/test/java/lang/ProcessBuilder/PipelineTest.java
@@ -19,7 +19,6 @@
* 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.
- *
*/
import java.io.File;
diff --git a/jdk/test/java/lang/StackWalker/CountLocalSlots.java b/jdk/test/java/lang/StackWalker/CountLocalSlots.java
index c78a4cb7bf4fddb0189c2bb8c5adf5ba7ce6704e..066055b0a1d2985575f0832e478d917e31e23d57 100644
--- a/jdk/test/java/lang/StackWalker/CountLocalSlots.java
+++ b/jdk/test/java/lang/StackWalker/CountLocalSlots.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 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
diff --git a/jdk/test/java/lang/StackWalker/LocalsAndOperands.java b/jdk/test/java/lang/StackWalker/LocalsAndOperands.java
index b253ab27e81b765aceacefa7a5c2322140ea17a0..f4f646549ec79788adb7492cb8c815da3ee509f2 100644
--- a/jdk/test/java/lang/StackWalker/LocalsAndOperands.java
+++ b/jdk/test/java/lang/StackWalker/LocalsAndOperands.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
diff --git a/jdk/test/java/lang/StackWalker/LocalsCrash.java b/jdk/test/java/lang/StackWalker/LocalsCrash.java
index b50dd263f00695194f9ba2cdffea9bfad0766684..87415e4df0c4dab1c854f1b9605c38a1253d69f6 100644
--- a/jdk/test/java/lang/StackWalker/LocalsCrash.java
+++ b/jdk/test/java/lang/StackWalker/LocalsCrash.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 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
diff --git a/jdk/test/java/lang/String/concat/CompactStringsInitialCoder.java b/jdk/test/java/lang/String/concat/CompactStringsInitialCoder.java
index 6f566c33eb93ca87d8303a641494685e8224b6f7..5669bce2fd82754c1f96bb15de5a7329059ee5a9 100644
--- a/jdk/test/java/lang/String/concat/CompactStringsInitialCoder.java
+++ b/jdk/test/java/lang/String/concat/CompactStringsInitialCoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 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
diff --git a/jdk/test/java/lang/String/concat/StringConcatFactoryEmptyMethods.java b/jdk/test/java/lang/String/concat/StringConcatFactoryEmptyMethods.java
index 31b29cd30fd0280b3fbf67d8b5963df07c7b0781..7ee0d98852992879d36284588bd0f27d28f2a7e3 100644
--- a/jdk/test/java/lang/String/concat/StringConcatFactoryEmptyMethods.java
+++ b/jdk/test/java/lang/String/concat/StringConcatFactoryEmptyMethods.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 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
diff --git a/jdk/test/java/lang/String/concat/WithSecurityManager.java b/jdk/test/java/lang/String/concat/WithSecurityManager.java
index 9359d29fbb178b2801551bb414fb86210a5dc9e0..2835a3813f48802f1c5e793d0e321a275aecdf90 100644
--- a/jdk/test/java/lang/String/concat/WithSecurityManager.java
+++ b/jdk/test/java/lang/String/concat/WithSecurityManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 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
diff --git a/jdk/test/java/lang/Thread/ThreadStateController.java b/jdk/test/java/lang/Thread/ThreadStateController.java
index 728a115c271ce559e343e1f59281a0e0b9e0ef95..c426d1b34b4292bb31231d842aac15ced89bf34a 100644
--- a/jdk/test/java/lang/Thread/ThreadStateController.java
+++ b/jdk/test/java/lang/Thread/ThreadStateController.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
diff --git a/jdk/test/java/lang/annotation/typeAnnotations/GetAnnotatedReceiverType.java b/jdk/test/java/lang/annotation/typeAnnotations/GetAnnotatedReceiverType.java
index e9608089763a113db1d1fe77224766f73827a715..084ed5638092feba9e61732039427273b2e2cdae 100644
--- a/jdk/test/java/lang/annotation/typeAnnotations/GetAnnotatedReceiverType.java
+++ b/jdk/test/java/lang/annotation/typeAnnotations/GetAnnotatedReceiverType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, 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
diff --git a/jdk/test/java/lang/instrument/NMTHelper.java b/jdk/test/java/lang/instrument/NMTHelper.java
index 09e60e4a6238713ac220ab7743d976372459df07..07ee25be38ddb8f134f42869d69ef563d24f0161 100644
--- a/jdk/test/java/lang/instrument/NMTHelper.java
+++ b/jdk/test/java/lang/instrument/NMTHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
diff --git a/jdk/test/java/lang/invoke/6987555/Test6987555.java b/jdk/test/java/lang/invoke/6987555/Test6987555.java
index 7a2f45c6efe394511c6544a774f12210fc64ff92..eb93900732643026bd543609180c57c74cab0049 100644
--- a/jdk/test/java/lang/invoke/6987555/Test6987555.java
+++ b/jdk/test/java/lang/invoke/6987555/Test6987555.java
@@ -19,7 +19,6 @@
* 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.
- *
*/
/**
diff --git a/jdk/test/java/lang/invoke/6991596/Test6991596.java b/jdk/test/java/lang/invoke/6991596/Test6991596.java
index a7083bd81147ce2bd524ba6afb0f66bb554a6a44..193009deafd4222e39a6414556355777cda00a40 100644
--- a/jdk/test/java/lang/invoke/6991596/Test6991596.java
+++ b/jdk/test/java/lang/invoke/6991596/Test6991596.java
@@ -19,7 +19,6 @@
* 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.
- *
*/
/**
diff --git a/jdk/test/java/lang/invoke/6998541/Test6998541.java b/jdk/test/java/lang/invoke/6998541/Test6998541.java
index 1edf14f9dc6d7b7a0d74faaa9e73c807551b0df1..983c23b3640f59edb3ebd86900d4dea875e31d43 100644
--- a/jdk/test/java/lang/invoke/6998541/Test6998541.java
+++ b/jdk/test/java/lang/invoke/6998541/Test6998541.java
@@ -19,7 +19,6 @@
* 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.
- *
*/
/**
diff --git a/jdk/test/java/lang/invoke/7087570/Test7087570.java b/jdk/test/java/lang/invoke/7087570/Test7087570.java
index 732467b8c62aad94ff40921d10fb654ad0d7dd58..165968c606902d95aa0c79f14407435e3ed18120 100644
--- a/jdk/test/java/lang/invoke/7087570/Test7087570.java
+++ b/jdk/test/java/lang/invoke/7087570/Test7087570.java
@@ -19,7 +19,6 @@
* 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
diff --git a/jdk/test/java/lang/invoke/7157574/Test7157574.java b/jdk/test/java/lang/invoke/7157574/Test7157574.java
index acf9ef48a04f3fc062df9096cd85cb1c42500daf..d2a91d92626841ddcd26d41a8466841f051c67d2 100644
--- a/jdk/test/java/lang/invoke/7157574/Test7157574.java
+++ b/jdk/test/java/lang/invoke/7157574/Test7157574.java
@@ -19,7 +19,6 @@
* 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.
- *
*/
/*
diff --git a/jdk/test/java/lang/invoke/7196190/ClassForNameTest.java b/jdk/test/java/lang/invoke/7196190/ClassForNameTest.java
index 4730efafb6c0f71cb6bfae1fb1710485d5369064..e0797f0f7413acc5618c1dfde2337a2f1f5b4df3 100644
--- a/jdk/test/java/lang/invoke/7196190/ClassForNameTest.java
+++ b/jdk/test/java/lang/invoke/7196190/ClassForNameTest.java
@@ -19,7 +19,6 @@
* 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.
- *
*/
/**
diff --git a/jdk/test/java/lang/invoke/7196190/GetUnsafeTest.java b/jdk/test/java/lang/invoke/7196190/GetUnsafeTest.java
index 24a9512ffaf74213e853189580e5caa458ca73a9..57a06d16b054fd72e709f83075d02d7ead9419a2 100644
--- a/jdk/test/java/lang/invoke/7196190/GetUnsafeTest.java
+++ b/jdk/test/java/lang/invoke/7196190/GetUnsafeTest.java
@@ -19,7 +19,6 @@
* 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.
- *
*/
/**
diff --git a/jdk/test/java/lang/invoke/8009222/Test8009222.java b/jdk/test/java/lang/invoke/8009222/Test8009222.java
index 711969387ed3804ceefd272d5fdc873ab73d1177..62ee09c066ad5baac575a8def70e687a2569903d 100644
--- a/jdk/test/java/lang/invoke/8009222/Test8009222.java
+++ b/jdk/test/java/lang/invoke/8009222/Test8009222.java
@@ -19,7 +19,6 @@
* 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.
- *
*/
/**
diff --git a/jdk/test/java/lang/invoke/8022701/BogoLoader.java b/jdk/test/java/lang/invoke/8022701/BogoLoader.java
index e77be6f44ff1f32908bd10b3da13610b66052e24..e8c579a27c84f8d52241b621694841c96b0b36af 100644
--- a/jdk/test/java/lang/invoke/8022701/BogoLoader.java
+++ b/jdk/test/java/lang/invoke/8022701/BogoLoader.java
@@ -19,7 +19,6 @@
* 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.
- *
*/
import java.io.BufferedInputStream;
diff --git a/jdk/test/java/lang/invoke/8022701/InvokeSeveralWays.java b/jdk/test/java/lang/invoke/8022701/InvokeSeveralWays.java
index 5c1f64bf9b0cf8fb413ba8394656bef48e35fb3c..011ae7f43a5c7a527201a1e583f36c078e2943ea 100644
--- a/jdk/test/java/lang/invoke/8022701/InvokeSeveralWays.java
+++ b/jdk/test/java/lang/invoke/8022701/InvokeSeveralWays.java
@@ -19,7 +19,6 @@
* 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.
- *
*/
import java.lang.reflect.InvocationTargetException;
diff --git a/jdk/test/java/lang/invoke/8022701/Invoker.java b/jdk/test/java/lang/invoke/8022701/Invoker.java
index a97159e9e292f511426e8d61de97cbfe38423bf6..62015fae371fe48414ee9c0d1e5a697e80551904 100644
--- a/jdk/test/java/lang/invoke/8022701/Invoker.java
+++ b/jdk/test/java/lang/invoke/8022701/Invoker.java
@@ -19,7 +19,6 @@
* 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.
- *
*/
public class Invoker {
diff --git a/jdk/test/java/lang/invoke/8022701/MHIllegalAccess.java b/jdk/test/java/lang/invoke/8022701/MHIllegalAccess.java
index badc1a817f3486e3550ba2491243275ccbd6803a..18d4a4c6752707c46d40f5d8b172099245b0994c 100644
--- a/jdk/test/java/lang/invoke/8022701/MHIllegalAccess.java
+++ b/jdk/test/java/lang/invoke/8022701/MHIllegalAccess.java
@@ -19,7 +19,6 @@
* 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.
- *
*/
/**
diff --git a/jdk/test/java/lang/invoke/8022701/MethodSupplier.java b/jdk/test/java/lang/invoke/8022701/MethodSupplier.java
index 4699a52aaffb713ef541c2607504b7353eee02f4..5ef4d20f1ac40ce33e51fe26e8a7db0fcb55efe9 100644
--- a/jdk/test/java/lang/invoke/8022701/MethodSupplier.java
+++ b/jdk/test/java/lang/invoke/8022701/MethodSupplier.java
@@ -19,7 +19,6 @@
* 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.
- *
*/
/*
diff --git a/jdk/test/java/lang/invoke/CallSiteTest.java b/jdk/test/java/lang/invoke/CallSiteTest.java
index 48b0d7b6d9a7caa2068b0d8aad06aef92b633e31..bf0fe2e4dc786bdcbba4277b6f17f5351d0962d5 100644
--- a/jdk/test/java/lang/invoke/CallSiteTest.java
+++ b/jdk/test/java/lang/invoke/CallSiteTest.java
@@ -19,7 +19,6 @@
* 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.
- *
*/
/**
diff --git a/jdk/test/java/lang/invoke/CallStaticInitOrder.java b/jdk/test/java/lang/invoke/CallStaticInitOrder.java
index 83808f8fb9fd933b6bdc8760f7b44cc135ffbfcf..4090e8fff2dd3bffbdc713bbe2d76ff4fb1e5592 100644
--- a/jdk/test/java/lang/invoke/CallStaticInitOrder.java
+++ b/jdk/test/java/lang/invoke/CallStaticInitOrder.java
@@ -19,7 +19,6 @@
* 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.
- *
*/
/**
diff --git a/jdk/test/java/lang/invoke/ProtectedMemberDifferentPackage/Test.java b/jdk/test/java/lang/invoke/ProtectedMemberDifferentPackage/Test.java
index edfe52af8a75eb8763d45bb1009c549e897fd81f..7356b290768ec8627d6f366053cc76a3e30baebd 100644
--- a/jdk/test/java/lang/invoke/ProtectedMemberDifferentPackage/Test.java
+++ b/jdk/test/java/lang/invoke/ProtectedMemberDifferentPackage/Test.java
@@ -19,7 +19,6 @@
* 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.
- *
*/
/**
diff --git a/jdk/test/java/lang/invoke/ProtectedMemberDifferentPackage/p1/T2.java b/jdk/test/java/lang/invoke/ProtectedMemberDifferentPackage/p1/T2.java
index 154109c883a452dca36018cc072fe6a0bc076a68..771e87f67aaa52203c909533db16cd33665e17b2 100644
--- a/jdk/test/java/lang/invoke/ProtectedMemberDifferentPackage/p1/T2.java
+++ b/jdk/test/java/lang/invoke/ProtectedMemberDifferentPackage/p1/T2.java
@@ -19,8 +19,8 @@
* 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.
- *
*/
+
package p1;
import p2.T3;
diff --git a/jdk/test/java/lang/invoke/ProtectedMemberDifferentPackage/p2/T3.java b/jdk/test/java/lang/invoke/ProtectedMemberDifferentPackage/p2/T3.java
index 9f4d7cee9bcd9653c67e00fe4b6f0cf65c77e335..0deba761a7403a7ba75b5e1a3d2e1a0391bc8cce 100644
--- a/jdk/test/java/lang/invoke/ProtectedMemberDifferentPackage/p2/T3.java
+++ b/jdk/test/java/lang/invoke/ProtectedMemberDifferentPackage/p2/T3.java
@@ -19,8 +19,8 @@
* 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.
- *
*/
+
package p2;
import p1.T2;
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeBoolean.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeBoolean.java
index 624f98a8407ffedd70d166fd6fb3609be34683ab..4a1d01034111d73440a7640ea2bacd65db130367 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeBoolean.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeBoolean.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeByte.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeByte.java
index 692d667ac05f2f5a9642ec733027e4374fbfe4fe..a067b57182a4f2e5acca854ec9a158370581c197 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeByte.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeByte.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeChar.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeChar.java
index 268e521f2949ae450505ef1a45fc7b4cdcada62d..0638b88aef47dafa915d233118c033e17c207c93 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeChar.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeChar.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeDouble.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeDouble.java
index e3bf8363a150e97461387ec0c6982930b3fc5975..0bc17bab3b9877dee3faf2b9c6b594b9e3c53f41 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeDouble.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeDouble.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeFloat.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeFloat.java
index 34617e2102ee41819f7c46e1be46c3f8dea100e9..12efef61cda04c407d23d3b5d78df31ff48ef1c2 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeFloat.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeFloat.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeInt.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeInt.java
index 33b33970f8035a725e9c67ffd468549a7d3af0d6..7291c0ebbc25f6dc04a8d0f5b4bb180f57ccb824 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeInt.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeInt.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeLong.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeLong.java
index 654619335fe1a94a654790155b3e3b3e53357143..d081ddec84236bcab8c7149b554507486288ac95 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeLong.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeLong.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeShort.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeShort.java
index 82b6f3cab785aefbb19aba08417e9bb54aa9f7c7..eba0cd204b365d1ed6b11b93cd6b5fa0672df27a 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeShort.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeShort.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeString.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeString.java
index 41d0e6b47023ecbcca1b32e63feffc714c3756a4..91e25c99bb9b4f735a84d280ce948a76645937e2 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeString.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeString.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
diff --git a/jdk/test/java/lang/invoke/accessProtectedSuper/BogoLoader.java b/jdk/test/java/lang/invoke/accessProtectedSuper/BogoLoader.java
index 190761dd6df6ff59a996970d7843cbe2e598baa9..a129ea254a4d8193fd5b2b3921f2632e795e8ca5 100644
--- a/jdk/test/java/lang/invoke/accessProtectedSuper/BogoLoader.java
+++ b/jdk/test/java/lang/invoke/accessProtectedSuper/BogoLoader.java
@@ -19,7 +19,6 @@
* 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.
- *
*/
import java.io.BufferedInputStream;
diff --git a/jdk/test/java/lang/invoke/accessProtectedSuper/MethodInvoker.java b/jdk/test/java/lang/invoke/accessProtectedSuper/MethodInvoker.java
index d14e7ef8a3584a84f7f2cbbdaeb6c33e3e78129a..fae5e46664622ed2660422a0967a956b6b544f93 100644
--- a/jdk/test/java/lang/invoke/accessProtectedSuper/MethodInvoker.java
+++ b/jdk/test/java/lang/invoke/accessProtectedSuper/MethodInvoker.java
@@ -19,7 +19,6 @@
* 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.
- *
*/
import anotherpkg.MethodSupplierOuter;
diff --git a/jdk/test/java/lang/invoke/accessProtectedSuper/Test.java b/jdk/test/java/lang/invoke/accessProtectedSuper/Test.java
index b83496f692fe8867aa26c73584fcaa9be12f8153..96b3fb637a1b9ae1803933cedac74d83610d0144 100644
--- a/jdk/test/java/lang/invoke/accessProtectedSuper/Test.java
+++ b/jdk/test/java/lang/invoke/accessProtectedSuper/Test.java
@@ -19,7 +19,6 @@
* 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.
- *
*/
/**
diff --git a/jdk/test/java/lang/invoke/accessProtectedSuper/anotherpkg/MethodSupplierOuter.java b/jdk/test/java/lang/invoke/accessProtectedSuper/anotherpkg/MethodSupplierOuter.java
index 314f8eab707a03440162b9d944e8a6a23ebacd55..cd40ed2050c2fe6823389b18c8efdc96c791fee0 100644
--- a/jdk/test/java/lang/invoke/accessProtectedSuper/anotherpkg/MethodSupplierOuter.java
+++ b/jdk/test/java/lang/invoke/accessProtectedSuper/anotherpkg/MethodSupplierOuter.java
@@ -19,7 +19,6 @@
* 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.
- *
*/
package anotherpkg;
diff --git a/jdk/test/java/lang/management/GarbageCollectorMXBean/GcInfoCompositeType.java b/jdk/test/java/lang/management/GarbageCollectorMXBean/GcInfoCompositeType.java
index a8bb8badf9bdf5b4268dbe6680c63dfc54eb8f45..13ae1e030c5cf2da25a84fd2ce109b299e615915 100644
--- a/jdk/test/java/lang/management/GarbageCollectorMXBean/GcInfoCompositeType.java
+++ b/jdk/test/java/lang/management/GarbageCollectorMXBean/GcInfoCompositeType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2016, 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
diff --git a/jdk/test/java/net/Inet4Address/textToNumericFormat.java b/jdk/test/java/net/Inet4Address/textToNumericFormat.java
index 1d010d0b912ed667fe0a4c0f29351321b8c931b3..7d75bc9f534ed730284bae1dbbac3c13089bee01 100644
--- a/jdk/test/java/net/Inet4Address/textToNumericFormat.java
+++ b/jdk/test/java/net/Inet4Address/textToNumericFormat.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2016, 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
diff --git a/jdk/test/java/net/ProxySelector/B8035158.java b/jdk/test/java/net/ProxySelector/B8035158.java
index 21b1e99d7027cac40ba02f44cf366236c39e90fe..432e457c3037f42c118a8cfcc16f57d3499a0305 100644
--- a/jdk/test/java/net/ProxySelector/B8035158.java
+++ b/jdk/test/java/net/ProxySelector/B8035158.java
@@ -20,6 +20,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+
/*
* @test
* @bug 8035158 8145732
diff --git a/jdk/test/java/net/URLClassLoader/definePackage/SplitPackage.java b/jdk/test/java/net/URLClassLoader/definePackage/SplitPackage.java
index 0b0096066241faeae2e4146f828812b92f6b32f5..c31441d8b1acce10f90388426c8e5369ffe377b6 100644
--- a/jdk/test/java/net/URLClassLoader/definePackage/SplitPackage.java
+++ b/jdk/test/java/net/URLClassLoader/definePackage/SplitPackage.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/jdk/test/java/net/URLPermission/nstest/LookupTest.java b/jdk/test/java/net/URLPermission/nstest/LookupTest.java
index f69522de22ff3ce10a376560fa2ab7d31f8d8f1b..d5b9141c1d41cb24d6e7b874c1f380fa12addf4d 100644
--- a/jdk/test/java/net/URLPermission/nstest/LookupTest.java
+++ b/jdk/test/java/net/URLPermission/nstest/LookupTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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
diff --git a/jdk/test/java/net/httpclient/BasicAuthTest.java b/jdk/test/java/net/httpclient/BasicAuthTest.java
index fb227e3f6725aea448fb423f4f45a823a016a81d..b78739e682af39c7c0ddad9e7caacabcb9343496 100644
--- a/jdk/test/java/net/httpclient/BasicAuthTest.java
+++ b/jdk/test/java/net/httpclient/BasicAuthTest.java
@@ -20,6 +20,7 @@
*
* 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.
*/
/**
diff --git a/jdk/test/java/net/httpclient/HeadersTest1.java b/jdk/test/java/net/httpclient/HeadersTest1.java
index 79f6200672261038709eee1c87abfe6b3aaccc33..e3c892ef2c1dc320d876a41972e4b25551cf4b9d 100644
--- a/jdk/test/java/net/httpclient/HeadersTest1.java
+++ b/jdk/test/java/net/httpclient/HeadersTest1.java
@@ -20,6 +20,7 @@
*
* 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.
*/
/**
diff --git a/jdk/test/java/net/httpclient/ImmutableHeaders.java b/jdk/test/java/net/httpclient/ImmutableHeaders.java
index 7286c2e1b0bc192660d1ed6cbb7c49c956decaf5..7773061dc3018407527c9f714ea1e1bbf6e2bc5c 100644
--- a/jdk/test/java/net/httpclient/ImmutableHeaders.java
+++ b/jdk/test/java/net/httpclient/ImmutableHeaders.java
@@ -20,6 +20,7 @@
*
* 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.
*/
/**
diff --git a/jdk/test/java/net/httpclient/security/Driver.java b/jdk/test/java/net/httpclient/security/Driver.java
index 078be5f5e51a274798f59e74a1c67ad4668644e1..3253fe2fd3c5a1d71395500fc6f5f1b563ae3162 100644
--- a/jdk/test/java/net/httpclient/security/Driver.java
+++ b/jdk/test/java/net/httpclient/security/Driver.java
@@ -20,6 +20,7 @@
*
* 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.
*/
/**
diff --git a/jdk/test/java/net/httpclient/security/Security.java b/jdk/test/java/net/httpclient/security/Security.java
index 2108c9fce29400514d6962d39c6a5d8bd99f73c6..5c282be9a367aa895640c5bc2a394107d43c5b2e 100644
--- a/jdk/test/java/net/httpclient/security/Security.java
+++ b/jdk/test/java/net/httpclient/security/Security.java
@@ -20,6 +20,7 @@
*
* 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.
*/
/**
diff --git a/jdk/test/java/util/Arrays/Correct.java b/jdk/test/java/util/Arrays/Correct.java
index e9ddc7edef53b8adee10be9bc4e21c73506e2d57..f69ea9160ffb932793eb876ff18cf497db364b6a 100644
--- a/jdk/test/java/util/Arrays/Correct.java
+++ b/jdk/test/java/util/Arrays/Correct.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2014, 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
diff --git a/jdk/test/java/util/Map/FunctionalCMEs.java b/jdk/test/java/util/Map/FunctionalCMEs.java
index 6f92b0181855c9833fd77bf52db162e9c4af3827..4d83d241c941aa9930b00126c88546d7d6a257ba 100644
--- a/jdk/test/java/util/Map/FunctionalCMEs.java
+++ b/jdk/test/java/util/Map/FunctionalCMEs.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 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
@@ -22,6 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+
import java.util.Arrays;
import java.util.ConcurrentModificationException;
import java.util.HashMap;
diff --git a/jdk/test/java/util/Objects/CheckIndex.java b/jdk/test/java/util/Objects/CheckIndex.java
index bcfa1d5b23de841b7ba28c6b8edb36c5f9102d30..594e806dcd0e07ba10b5f7eebee424664e993cb0 100644
--- a/jdk/test/java/util/Objects/CheckIndex.java
+++ b/jdk/test/java/util/Objects/CheckIndex.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
diff --git a/jdk/test/java/util/concurrent/FutureTask/NegativeTimeout.java b/jdk/test/java/util/concurrent/FutureTask/NegativeTimeout.java
index f2e18f6d1bf67728af9a926c2993c2c1dc474272..37cf4359580e48aa8b42c60d1a116f3edaf14139 100644
--- a/jdk/test/java/util/concurrent/FutureTask/NegativeTimeout.java
+++ b/jdk/test/java/util/concurrent/FutureTask/NegativeTimeout.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
diff --git a/jdk/test/java/util/logging/Logger/entering/LoggerEnteringWithParams.java b/jdk/test/java/util/logging/Logger/entering/LoggerEnteringWithParams.java
index d63e619830a05ca9048a5475bee357a1b24d9583..d9b494741abbd89c4f5b1c71bdd2c800ea858076 100644
--- a/jdk/test/java/util/logging/Logger/entering/LoggerEnteringWithParams.java
+++ b/jdk/test/java/util/logging/Logger/entering/LoggerEnteringWithParams.java
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/jdk/test/java/util/logging/XMLFormatterDate.java b/jdk/test/java/util/logging/XMLFormatterDate.java
index ee0eeb98b570bcf9a780f699e5db5e97ebcdb806..3b0d7029464591ed295e2f714671237dd68695c6 100644
--- a/jdk/test/java/util/logging/XMLFormatterDate.java
+++ b/jdk/test/java/util/logging/XMLFormatterDate.java
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -21,6 +20,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
diff --git a/jdk/test/java/util/regex/PatternStreamTest.java b/jdk/test/java/util/regex/PatternStreamTest.java
index 1f02e410321437d73ea0428282e84277b637e3af..9809ea20aef5c7668ad2f0aa1468177428d2aca4 100644
--- a/jdk/test/java/util/regex/PatternStreamTest.java
+++ b/jdk/test/java/util/regex/PatternStreamTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
diff --git a/jdk/test/java/util/zip/TestCRC32.java b/jdk/test/java/util/zip/TestCRC32.java
index 68c15aed44b12d28665a017cbacf62bfb9057879..15d919ddb612cba115c0e6fb171e66a1cf815057 100644
--- a/jdk/test/java/util/zip/TestCRC32.java
+++ b/jdk/test/java/util/zip/TestCRC32.java
@@ -1,6 +1,3 @@
-
-import java.util.zip.CRC32;
-
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -24,6 +21,8 @@ import java.util.zip.CRC32;
* questions.
*/
+import java.util.zip.CRC32;
+
/**
* @test @summary Check that CRC-32 returns the expected CRC value for the
* string 123456789
diff --git a/jdk/test/java/util/zip/TestCRC32C.java b/jdk/test/java/util/zip/TestCRC32C.java
index bb5ea0447c5881af8985030b537cc247aff8bbb4..6adf260dbab75ce4362ec80f6e48b14c1da7d413 100644
--- a/jdk/test/java/util/zip/TestCRC32C.java
+++ b/jdk/test/java/util/zip/TestCRC32C.java
@@ -1,6 +1,3 @@
-
-import java.util.zip.CRC32C;
-
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -24,6 +21,8 @@ import java.util.zip.CRC32C;
* questions.
*/
+import java.util.zip.CRC32C;
+
/**
* @test @summary Check that CRC-32C returns the expected CRC value for the
* string 123456789
diff --git a/jdk/test/java/util/zip/ZipFile/TestZipFile.java b/jdk/test/java/util/zip/ZipFile/TestZipFile.java
index 515ed356c2b071acc8bc2834db4b1ff4ca819059..25b87ff1242f2b835da9ca9be26c84ca25ad8da8 100644
--- a/jdk/test/java/util/zip/ZipFile/TestZipFile.java
+++ b/jdk/test/java/util/zip/ZipFile/TestZipFile.java
@@ -8,7 +8,7 @@
*
* 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
+ * 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).
*