diff --git a/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java b/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java
index 6377d28ea..fdfdc39ed 100644
--- a/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java
@@ -60,7 +60,7 @@ public class SQLExampleTask extends JDBCTask {
         Statement stmt=null;
         try {
             if (tableName == null) {
-                throw new BuildException("TableName must be specified",location);
+                throw new BuildException("TableName must be specified", location);
             }
             String sql = "SELECT * FROM "+tableName;
             stmt= conn.createStatement();
diff --git a/src/tests/antunit/core/uuencode/src/task/BaseTask.java b/src/tests/antunit/core/uuencode/src/task/BaseTask.java
index 70eb7a32c..cfb30b113 100644
--- a/src/tests/antunit/core/uuencode/src/task/BaseTask.java
+++ b/src/tests/antunit/core/uuencode/src/task/BaseTask.java
@@ -31,7 +31,7 @@ import java.io.OutputStream;
  * Base class for the uuencode/decode test tasks.
  */
 abstract public class BaseTask extends Task {
-    private final static FileUtils FILE_UTILS = FileUtils.getFileUtils();
+    private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
     private File inFile;
     private File outFile;
 
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/ManifestTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/ManifestTest.java
index 3dbcdf1b4..f8bd3299b 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/ManifestTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/ManifestTest.java
@@ -55,10 +55,10 @@ public class ManifestTest {
     private File outDir;
 
     public static final String LONG_LINE
-        = "AReallyLongLineToTestLineBreakingInManifests-ACapabilityWhich" +
-          "IsSureToLeadToHundredsOfQuestionsAboutWhyAntMungesManifests" +
-          "OfCourseTheAnswerIsThatIsWhatTheSpecRequiresAndIfAnythingHas" +
-          "AProblemWithThatItIsNotABugInAnt";
+            = "AReallyLongLineToTestLineBreakingInManifests-ACapabilityWhich"
+            + "IsSureToLeadToHundredsOfQuestionsAboutWhyAntMungesManifests"
+            + "OfCourseTheAnswerIsThatIsWhatTheSpecRequiresAndIfAnythingHas"
+            + "AProblemWithThatItIsNotABugInAnt";
 
     public static final String LONG_70_NAME
         = "ThisNameIsJustSeventyCharactersWhichIsAllowedAccordingToTheSpecsFiller";
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/TouchTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/TouchTest.java
index 0f901462c..80a08846a 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/TouchTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/TouchTest.java
@@ -193,7 +193,7 @@ public class TouchTest {
      * @param timestamp long
      * @param time long
      */
-    public void assertTimesNearlyMatch(long timestamp,long time) {
+    public void assertTimesNearlyMatch(long timestamp, long time) {
         long granularity= FILE_UTILS.getFileTimestampGranularity();
         assertTimesNearlyMatch(timestamp, time, granularity);
     }
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/XmlPropertyTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/XmlPropertyTest.java
index fb3cde2d2..379f6be2d 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/XmlPropertyTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/XmlPropertyTest.java
@@ -332,7 +332,7 @@ public class XmlPropertyTest {
      * Retrieve a list of xml files in the specified folder
      * and below.
      */
-    private static Enumeration<File> getFiles (final File startingDir) {
+    private static Enumeration<File> getFiles(final File startingDir) {
         Vector<File> result = new Vector<>();
         getFiles(startingDir, result);
         return result.elements();
@@ -342,7 +342,7 @@ public class XmlPropertyTest {
      * Collect a list of xml files in the specified folder
      * and below.
      */
-    private static void getFiles (final File startingDir, Vector<File> collect) {
+    private static void getFiles(final File startingDir, Vector<File> collect) {
         FileFilter filter = file -> {
             if (file.isDirectory()) {
                 return true;
diff --git a/src/tests/junit/org/apache/tools/ant/types/MapperTest.java b/src/tests/junit/org/apache/tools/ant/types/MapperTest.java
index 37433eaf3..3949a15ad 100644
--- a/src/tests/junit/org/apache/tools/ant/types/MapperTest.java
+++ b/src/tests/junit/org/apache/tools/ant/types/MapperTest.java
@@ -222,7 +222,7 @@ public class MapperTest {
         String[] targets = fileNameMapper.mapFileName("a");
         assertNotNull("no filenames mapped", targets);
         assertEquals("wrong number of filenames mapped", 2, targets.length);
-        List list = Arrays.asList(targets);
+        List<String> list = Arrays.asList(targets);
         assertTrue("cannot find expected target \"def\"", list.contains("def"));
         assertTrue("cannot find expected target \"ghi\"", list.contains("ghi"));
 
diff --git a/src/tests/junit/org/apache/tools/ant/util/LazyFileOutputStreamTest.java b/src/tests/junit/org/apache/tools/ant/util/LazyFileOutputStreamTest.java
index 2a4cbf766..513472c0c 100644
--- a/src/tests/junit/org/apache/tools/ant/util/LazyFileOutputStreamTest.java
+++ b/src/tests/junit/org/apache/tools/ant/util/LazyFileOutputStreamTest.java
@@ -31,7 +31,7 @@ import static org.junit.Assert.assertTrue;
  */
 public class LazyFileOutputStreamTest {
     private LazyFileOutputStream los;
-    private final static File f = new File("test.txt");
+    private static final File f = new File("test.txt");
 
     @Before
     public void setUp() {