diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
index 13cfc068cb7..b44a79d1b1e 100644
--- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
@@ -170,6 +170,7 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
 				.createAsyncRequest(new URI(getLocalUrl("/hello")), HttpMethod.GET)
 				.executeAsync();
 		assertThat(response2.get(10, TimeUnit.SECONDS).getRawStatusCode()).isEqualTo(200);
+		clientHttpRequestFactory.destroy();
 	}
 
 	@Test
diff --git a/spring-boot/src/test/java/org/springframework/boot/jta/bitronix/PoolingDataSourceBeanTests.java b/spring-boot/src/test/java/org/springframework/boot/jta/bitronix/PoolingDataSourceBeanTests.java
index 7e880f109de..51973e857fe 100644
--- a/spring-boot/src/test/java/org/springframework/boot/jta/bitronix/PoolingDataSourceBeanTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/jta/bitronix/PoolingDataSourceBeanTests.java
@@ -21,6 +21,7 @@ import java.sql.Connection;
 import javax.sql.XAConnection;
 import javax.sql.XADataSource;
 
+import bitronix.tm.TransactionManagerServices;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -72,6 +73,7 @@ public class PoolingDataSourceBeanTests {
 		this.bean.init();
 		this.bean.createPooledConnection(dataSource, this.bean);
 		verify(dataSource).getXAConnection();
+		TransactionManagerServices.getTaskScheduler().shutdown();
 	}
 
 }