diff --git a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/AbstractDevToolsDataSourceAutoConfigurationTests.java b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/AbstractDevToolsDataSourceAutoConfigurationTests.java
index 6fc1309b4ff..c7355edc204 100644
--- a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/AbstractDevToolsDataSourceAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/AbstractDevToolsDataSourceAutoConfigurationTests.java
@@ -20,7 +20,6 @@ import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Collection;
-import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Supplier;
 
@@ -95,11 +94,9 @@ public abstract class AbstractDevToolsDataSourceAutoConfigurationTests {
 
 	protected ConfigurableApplicationContext getContext(
 			Supplier<ConfigurableApplicationContext> supplier) throws Exception {
-		CountDownLatch latch = new CountDownLatch(1);
 		AtomicReference<ConfigurableApplicationContext> atomicReference = new AtomicReference<>();
 		Thread thread = new Thread(() -> {
 			ConfigurableApplicationContext context = supplier.get();
-			latch.countDown();
 			atomicReference.getAndSet(context);
 		});
 		thread.start();
diff --git a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfigurationTests.java b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfigurationTests.java
index 5546f816f19..fd775f64d69 100644
--- a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfigurationTests.java
@@ -21,7 +21,6 @@ import java.time.Duration;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Supplier;
 
@@ -253,11 +252,9 @@ public class LocalDevToolsAutoConfigurationTests {
 
 	private ConfigurableApplicationContext getContext(
 			Supplier<ConfigurableApplicationContext> supplier) throws Exception {
-		CountDownLatch latch = new CountDownLatch(1);
 		AtomicReference<ConfigurableApplicationContext> atomicReference = new AtomicReference<>();
 		Thread thread = new Thread(() -> {
 			ConfigurableApplicationContext context = supplier.get();
-			latch.countDown();
 			atomicReference.getAndSet(context);
 		});
 		thread.start();
diff --git a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfigurationTests.java b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfigurationTests.java
index 4f82ae09961..7f037e5a043 100644
--- a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfigurationTests.java
@@ -16,7 +16,6 @@
 
 package org.springframework.boot.devtools.autoconfigure;
 
-import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Supplier;
 
@@ -183,11 +182,9 @@ public class RemoteDevToolsAutoConfigurationTests {
 	private AnnotationConfigServletWebApplicationContext getContext(
 			Supplier<AnnotationConfigServletWebApplicationContext> supplier)
 			throws Exception {
-		CountDownLatch latch = new CountDownLatch(1);
 		AtomicReference<AnnotationConfigServletWebApplicationContext> atomicReference = new AtomicReference<>();
 		Thread thread = new Thread(() -> {
 			AnnotationConfigServletWebApplicationContext context = supplier.get();
-			latch.countDown();
 			atomicReference.getAndSet(context);
 		});
 		thread.start();
diff --git a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/env/DevToolPropertiesIntegrationTests.java b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/env/DevToolPropertiesIntegrationTests.java
index 0c73845a3dc..cbcf917163a 100644
--- a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/env/DevToolPropertiesIntegrationTests.java
+++ b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/env/DevToolPropertiesIntegrationTests.java
@@ -18,7 +18,6 @@ package org.springframework.boot.devtools.env;
 
 import java.net.URL;
 import java.util.Collections;
-import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Supplier;
 
@@ -122,11 +121,9 @@ public class DevToolPropertiesIntegrationTests {
 
 	protected ConfigurableApplicationContext getContext(
 			Supplier<ConfigurableApplicationContext> supplier) throws Exception {
-		CountDownLatch latch = new CountDownLatch(1);
 		AtomicReference<ConfigurableApplicationContext> atomicReference = new AtomicReference<>();
 		Thread thread = new Thread(() -> {
 			ConfigurableApplicationContext context = supplier.get();
-			latch.countDown();
 			atomicReference.getAndSet(context);
 		});
 		thread.start();
diff --git a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/env/DevToolsHomePropertiesPostProcessorTests.java b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/env/DevToolsHomePropertiesPostProcessorTests.java
index 655806d4d65..cb2a71a99f8 100644
--- a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/env/DevToolsHomePropertiesPostProcessorTests.java
+++ b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/env/DevToolsHomePropertiesPostProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Properties;
-import java.util.concurrent.CountDownLatch;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -74,11 +73,7 @@ public class DevToolsHomePropertiesPostProcessorTests {
 	}
 
 	protected void runPostProcessor(Runnable runnable) throws Exception {
-		CountDownLatch latch = new CountDownLatch(1);
-		Thread thread = new Thread(() -> {
-			runnable.run();
-			latch.countDown();
-		});
+		Thread thread = new Thread(runnable);
 		thread.start();
 		thread.join();
 	}