diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/DefaultJmsListenerContainerFactoryConfigurer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/DefaultJmsListenerContainerFactoryConfigurer.java
index 91f6e87f3a3..41f15585b6f 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/DefaultJmsListenerContainerFactoryConfigurer.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/DefaultJmsListenerContainerFactoryConfigurer.java
@@ -101,7 +101,7 @@ public final class DefaultJmsListenerContainerFactoryConfigurer {
 	 * Set the {@link ObservationRegistry} to use.
 	 * @param observationRegistry the {@link ObservationRegistry}
 	 * @since 3.2.1
-	 * @deprecated since 3.3.10 for removal in 3.6.0 as this should have been package
+	 * @deprecated since 3.3.10 for removal in 4.0.0 as this should have been package
 	 * private
 	 */
 	@Deprecated(since = "3.3.10", forRemoval = true)
diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/ConditionReportApplicationContextFailureProcessor.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/ConditionReportApplicationContextFailureProcessor.java
index 66e45638b8b..d197408a578 100644
--- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/ConditionReportApplicationContextFailureProcessor.java
+++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/ConditionReportApplicationContextFailureProcessor.java
@@ -29,7 +29,7 @@ import org.springframework.test.context.ApplicationContextFailureProcessor;
  * @author Phillip Webb
  * @author Scott Frederick
  * @since 3.0.0
- * @deprecated in 3.2.11 for removal in 3.6.0
+ * @deprecated in 3.2.11 for removal in 4.0.0
  */
 @Deprecated(since = "3.2.11", forRemoval = true)
 public class ConditionReportApplicationContextFailureProcessor implements ApplicationContextFailureProcessor {
diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/ConditionReportApplicationContextFailureProcessorTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/ConditionReportApplicationContextFailureProcessorTests.java
index 21b7bda6d80..d2c40434faf 100644
--- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/ConditionReportApplicationContextFailureProcessorTests.java
+++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/ConditionReportApplicationContextFailureProcessorTests.java
@@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  *
  * @author Phillip Webb
  * @author Scott Frederick
- * @deprecated since 3.2.11 for removal in 3.6.0
+ * @deprecated since 3.2.11 for removal in 4.0.0
  */
 @ExtendWith(OutputCaptureExtension.class)
 @Deprecated(since = "3.2.11", forRemoval = true)