diff --git a/core/src/main/java/hudson/util/ProcessTree.java b/core/src/main/java/hudson/util/ProcessTree.java
index 569d0d9f21..38f63e0d22 100644
--- a/core/src/main/java/hudson/util/ProcessTree.java
+++ b/core/src/main/java/hudson/util/ProcessTree.java
@@ -958,9 +958,9 @@ public abstract class ProcessTree implements Iterable<OSProcess>, IProcessTree,
 
                 try (BufferedReader r = new BufferedReader(new FileReader(getFile("status")))) {
                     String line;
-                    while ((line = r.readLine()) != null) {
-                        line = line.toLowerCase(Locale.ENGLISH);
-                        if (line.startsWith("ppid:")) {
+                    while((line=r.readLine())!=null) {
+                        line=line.toLowerCase(Locale.ENGLISH);
+                        if(line.startsWith("ppid:")) {
                             ppid = Integer.parseInt(line.substring(5).trim());
                             break;
                         }
diff --git a/core/src/main/java/jenkins/util/AntClassLoader.java b/core/src/main/java/jenkins/util/AntClassLoader.java
index 587482ecd8..62abcc93c7 100644
--- a/core/src/main/java/jenkins/util/AntClassLoader.java
+++ b/core/src/main/java/jenkins/util/AntClassLoader.java
@@ -504,7 +504,7 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener {
                     return;
                 }
                 classpath = manifest.getMainAttributes()
-                        .getValue(Name.CLASS_PATH);
+                    .getValue(Name.CLASS_PATH);
             }
             if (classpath == null) {
                 classpath = "";
diff --git a/core/src/test/java/hudson/FilePathTest.java b/core/src/test/java/hudson/FilePathTest.java
index 70348334f9..79ad7816e8 100644
--- a/core/src/test/java/hudson/FilePathTest.java
+++ b/core/src/test/java/hudson/FilePathTest.java
@@ -208,13 +208,10 @@ public class FilePathTest {
             for (int i = 0; i < 10000; i++) {
                 // TODO is there a simpler way to force the TarOutputStream to be flushed and the reader to start?
                 // Have not found a way to make the failure guaranteed.
-                OutputStream os = from.child("content" + i).write();
-                try {
+                try (OutputStream os = from.child("content" + i).write()) {
                     for (int j = 0; j < 1024; j++) {
                         os.write('.');
                     }
-                } finally {
-                    os.close();
                 }
             }
             FilePath toF = to.child("content0");
diff --git a/core/src/test/java/hudson/util/io/ZipArchiverTest.java b/core/src/test/java/hudson/util/io/ZipArchiverTest.java
index 59767b16fc..b4edb31b47 100644
--- a/core/src/test/java/hudson/util/io/ZipArchiverTest.java
+++ b/core/src/test/java/hudson/util/io/ZipArchiverTest.java
@@ -82,22 +82,13 @@ public class ZipArchiverTest {
         // back-slashes ("\")
         String zipEntryName = null;
 
-        ZipFile zipFileVerify = null;
-        try {
-            zipFileVerify = new ZipFile(zipFile);
+        try (ZipFile zipFileVerify = new ZipFile(zipFile)) {
 
             zipEntryName = ((ZipEntry) zipFileVerify.entries().nextElement()).getName();
         } catch (Exception e) {
             fail("failure enumerating zip entries", e);
-        } finally {
-            if (zipFileVerify != null) {
-                try {
-                    zipFileVerify.close();
-                } catch (IOException e) {
-                    // ignored
-                }
-            }
         }
+        // ignored
 
         assertEquals("foo/bar/baz/Test.txt", zipEntryName);
     }
@@ -144,22 +135,13 @@ public class ZipArchiverTest {
         // examine zip contents and assert that there's an item there...
         String zipEntryName = null;
 
-        ZipFile zipFileVerify = null;
-        try {
-            zipFileVerify = new ZipFile(zipFile);
+        try (ZipFile zipFileVerify = new ZipFile(zipFile)) {
 
             zipEntryName = ((ZipEntry) zipFileVerify.entries().nextElement()).getName();
         } catch (Exception e) {
             fail("failure enumerating zip entries", e);
-        } finally {
-            if (zipFileVerify != null) {
-                try {
-                    zipFileVerify.close();
-                } catch (IOException e) {
-                    // ignored
-                }
-            }
         }
+        // ignored
 
         assertEquals("huge64bitFileTest.txt", zipEntryName);
     }