diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/TunnelClient.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/TunnelClient.java
index 2289af9c54d..c28c8841ca6 100644
--- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/TunnelClient.java
+++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/TunnelClient.java
@@ -170,10 +170,9 @@ public class TunnelClient implements SmartInitializingSingleton {
 
 		private void handleConnection(SocketChannel socketChannel) throws Exception {
 			Closeable closeable = new SocketCloseable(socketChannel);
-			WritableByteChannel outputChannel = TunnelClient.this.tunnelConnection
-					.open(socketChannel, closeable);
 			TunnelClient.this.listeners.fireOpenEvent(socketChannel);
-			try {
+			try (WritableByteChannel outputChannel = TunnelClient.this.tunnelConnection
+					.open(socketChannel, closeable)) {
 				logger.trace("Accepted connection to tunnel client from "
 						+ socketChannel.socket().getRemoteSocketAddress());
 				while (true) {
@@ -189,9 +188,6 @@ public class TunnelClient implements SmartInitializingSingleton {
 					}
 				}
 			}
-			finally {
-				outputChannel.close();
-			}
 		}
 
 		protected void stopAcceptingConnections() {
diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java
index 4cf1d45f8ae..3cdc2b930aa 100644
--- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java
+++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java
@@ -186,8 +186,7 @@ public class JarWriter implements LoaderClassesWriter, AutoCloseable {
 
 	private long getNestedLibraryTime(File file) {
 		try {
-			JarFile jarFile = new JarFile(file);
-			try {
+			try (JarFile jarFile = new JarFile(file)) {
 				Enumeration<JarEntry> entries = jarFile.entries();
 				while (entries.hasMoreElements()) {
 					JarEntry entry = entries.nextElement();
@@ -196,9 +195,6 @@ public class JarWriter implements LoaderClassesWriter, AutoCloseable {
 					}
 				}
 			}
-			finally {
-				jarFile.close();
-			}
 		}
 		catch (Exception ex) {
 			// Ignore and just use the source file timestamp
@@ -381,13 +377,9 @@ public class JarWriter implements LoaderClassesWriter, AutoCloseable {
 		private long size;
 
 		CrcAndSize(File file) throws IOException {
-			FileInputStream inputStream = new FileInputStream(file);
-			try {
+			try (FileInputStream inputStream = new FileInputStream(file)) {
 				load(inputStream);
 			}
-			finally {
-				inputStream.close();
-			}
 		}
 
 		CrcAndSize(InputStream inputStream) throws IOException {