diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/system/OutputCaptureExtension.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/system/OutputCaptureExtension.java
index 235b7720def..fb98a0e257d 100644
--- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/system/OutputCaptureExtension.java
+++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/system/OutputCaptureExtension.java
@@ -104,7 +104,8 @@ public class OutputCaptureExtension
 	}
 
 	private OutputCapture getOutputCapture(ExtensionContext context) {
-		return getStore(context).getOrComputeIfAbsent(OutputCapture.class);
+		return getStore(context).getOrComputeIfAbsent(OutputCapture.class, (key) -> new OutputCapture(),
+				OutputCapture.class);
 	}
 
 	private Store getStore(ExtensionContext context) {