diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfigurationTests.java
index b734504eb84..2287243988d 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfigurationTests.java
@@ -105,7 +105,6 @@ public class TaskExecutionAutoConfigurationTests {
 
 	@Test
 	public void taskExecutorAutoConfigured() {
-		this.output.reset();
 		this.contextRunner.run((context) -> {
 			assertThat(this.output.toString())
 					.doesNotContain("Initializing ExecutorService");
diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/extension/OutputCapture.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/extension/OutputCapture.java
index a7930ac035a..c7da5ef826b 100644
--- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/extension/OutputCapture.java
+++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/extension/OutputCapture.java
@@ -84,6 +84,9 @@ public class OutputCapture implements BeforeEachCallback, AfterEachCallback,
 	}
 
 	private void releaseOutput() {
+		if (this.captureOut == null) {
+			return;
+		}
 		AnsiOutputControl.get().enabledAnsiOutput();
 		System.setOut(this.captureOut.getOriginal());
 		System.setErr(this.captureErr.getOriginal());