diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/system/CapturedOutput.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/system/CapturedOutput.java
index 440ab768238..166cb70e7b1 100644
--- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/system/CapturedOutput.java
+++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/system/CapturedOutput.java
@@ -18,7 +18,7 @@ package org.springframework.boot.test.system;
 
 /**
  * Provides access to {@link System#out System.out} and {@link System#err System.err}
- * output that has been capture by the {@link OutputCaptureExtension}. Can be used to
+ * output that has been captured by the {@link OutputCaptureExtension}. Can be used to
  * apply assertions either using AssertJ or standard JUnit assertions. For example:
  * <pre class="code">
  * assertThat(output).contains("started"); // Checks all output
diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/system/OutputCapture.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/system/OutputCapture.java
index 9c58eca99fe..48797579406 100644
--- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/system/OutputCapture.java
+++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/system/OutputCapture.java
@@ -276,7 +276,7 @@ class OutputCapture implements CapturedOutput {
 	}
 
 	/**
-	 * Save disable and restore AnsiOutput without it needing to be on the classpath.
+	 * Save, disable and restore AnsiOutput without it needing to be on the classpath.
 	 */
 	private static class AnsiOutputState {
 
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 af5754f208c..a5672ee5e29 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
@@ -37,7 +37,7 @@ import org.junit.jupiter.api.extension.ParameterResolver;
  * argument to your test class constructor or test method:
  *
  * <pre class="code">
- * &#064;ExtendWith(OutputExtension.class)
+ * &#064;ExtendWith(OutputCaptureExtension.class)
  * class MyTest {
  *
  *     &#064;Test