diff --git a/spring-web/src/test/java/org/springframework/http/server/reactive/RandomHandlerIntegrationTests.java b/spring-web/src/test/java/org/springframework/http/server/reactive/RandomHandlerIntegrationTests.java
index f50447dfa0..5978951784 100644
--- a/spring-web/src/test/java/org/springframework/http/server/reactive/RandomHandlerIntegrationTests.java
+++ b/spring-web/src/test/java/org/springframework/http/server/reactive/RandomHandlerIntegrationTests.java
@@ -84,7 +84,7 @@ public class RandomHandlerIntegrationTests extends AbstractHttpHandlerIntegratio
 			Mono<Integer> requestSizeMono = request.getBody().
 					reduce(0, (integer, dataBuffer) -> integer +
 							dataBuffer.readableByteCount()).
-					doAfterTerminate((size, throwable) -> {
+					doOnSuccessOrError((size, throwable) -> {
 						assertNull(throwable);
 						assertEquals(REQUEST_SIZE, (long) size);
 					});
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/socket/WebSocketIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/socket/WebSocketIntegrationTests.java
index e5805ba80f..899d29dff5 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/socket/WebSocketIntegrationTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/socket/WebSocketIntegrationTests.java
@@ -73,7 +73,7 @@ public class WebSocketIntegrationTests extends AbstractWebSocketIntegrationTests
 							.subscribeWith(output)
 							.doOnNext(s -> logger.debug("inbound " + s))
 							.then()
-							.doOnTerminate((aVoid, ex) ->
+							.doOnSuccessOrError((aVoid, ex) ->
 									logger.debug("Done with " + (ex != null ? ex.getMessage() : "success")));
 				})
 				.block(Duration.ofMillis(5000));