diff --git a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/factory/TokenRelayGatewayFilterFactoryTests.java b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/factory/TokenRelayGatewayFilterFactoryTests.java
index ac0e30c7..2b180a38 100644
--- a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/factory/TokenRelayGatewayFilterFactoryTests.java
+++ b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/factory/TokenRelayGatewayFilterFactoryTests.java
@@ -121,7 +121,11 @@ public class TokenRelayGatewayFilterFactoryTests {
 		GatewayFilter filter = new TokenRelayGatewayFilterFactory(objectProvider).apply();
 		filter.filter(exchange, filterChain).block(TIMEOUT);
 
-		assertThat(request.getHeaders()).containsEntry(HttpHeaders.AUTHORIZATION,
+		ArgumentCaptor<ServerWebExchange> sweCaptor = ArgumentCaptor.forClass(ServerWebExchange.class);
+		verify(filterChain).filter(sweCaptor.capture());
+		ServerWebExchange mutatedServerWebExchange = sweCaptor.getValue();
+
+		assertThat(mutatedServerWebExchange.getRequest().getHeaders()).containsEntry(HttpHeaders.AUTHORIZATION,
 				Collections.singletonList("Bearer mytoken"));
 
 		ArgumentCaptor<OAuth2AuthorizeRequest> authorizeRequestCaptor = ArgumentCaptor
@@ -161,7 +165,11 @@ public class TokenRelayGatewayFilterFactoryTests {
 		GatewayFilter filter = new TokenRelayGatewayFilterFactory(objectProvider).apply(config);
 		filter.filter(exchange, filterChain).block(TIMEOUT);
 
-		assertThat(request.getHeaders()).containsEntry(HttpHeaders.AUTHORIZATION,
+		ArgumentCaptor<ServerWebExchange> sweCaptor = ArgumentCaptor.forClass(ServerWebExchange.class);
+		verify(filterChain).filter(sweCaptor.capture());
+		ServerWebExchange mutatedServerWebExchange = sweCaptor.getValue();
+
+		assertThat(mutatedServerWebExchange.getRequest().getHeaders()).containsEntry(HttpHeaders.AUTHORIZATION,
 				Collections.singletonList("Bearer mytoken"));
 
 		ArgumentCaptor<OAuth2AuthorizeRequest> authorizeRequestCaptor = ArgumentCaptor
@@ -212,7 +220,10 @@ public class TokenRelayGatewayFilterFactoryTests {
 		GatewayFilter filter = new TokenRelayGatewayFilterFactory(objectProvider).apply(config);
 		filter.filter(exchange, filterChain).block(TIMEOUT);
 
-		assertThat(request.getHeaders()).containsEntry(HttpHeaders.AUTHORIZATION,
+		ArgumentCaptor<ServerWebExchange> sweCaptor = ArgumentCaptor.forClass(ServerWebExchange.class);
+		verify(filterChain).filter(sweCaptor.capture());
+		ServerWebExchange mutatedServerWebExchange = sweCaptor.getValue();
+		assertThat(mutatedServerWebExchange.getRequest().getHeaders()).containsEntry(HttpHeaders.AUTHORIZATION,
 				Collections.singletonList("Bearer mytoken"));
 
 		ArgumentCaptor<OAuth2AuthorizeRequest> authorizeRequestCaptor = ArgumentCaptor
diff --git a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/factory/rewrite/ModifyRequestBodyGatewayFilterFactoryTests.java b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/factory/rewrite/ModifyRequestBodyGatewayFilterFactoryTests.java
index d4440c9b..2192a19a 100644
--- a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/factory/rewrite/ModifyRequestBodyGatewayFilterFactoryTests.java
+++ b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/factory/rewrite/ModifyRequestBodyGatewayFilterFactoryTests.java
@@ -86,10 +86,10 @@ public class ModifyRequestBodyGatewayFilterFactoryTests extends BaseWebClientTes
 			.body(BodyInserters.fromValue("request"))
 			.exchange()
 			.expectStatus()
-			.isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR)
+			.isEqualTo(HttpStatus.PAYLOAD_TOO_LARGE)
 			.expectBody()
-			.jsonPath("message")
-			.isEqualTo("Exceeded limit on max bytes to buffer : 13");
+			.jsonPath("error")
+			.isEqualTo("Payload Too Large");
 	}
 
 	@Test
diff --git a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/factory/rewrite/ModifyResponseBodyGatewayFilterFactoryTests.java b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/factory/rewrite/ModifyResponseBodyGatewayFilterFactoryTests.java
index ee87983f..0276a5df 100644
--- a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/factory/rewrite/ModifyResponseBodyGatewayFilterFactoryTests.java
+++ b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/factory/rewrite/ModifyResponseBodyGatewayFilterFactoryTests.java
@@ -87,7 +87,7 @@ public class ModifyResponseBodyGatewayFilterFactoryTests extends BaseWebClientTe
 	}
 
 	@Test
-	public void modifyResponeBodyToLarge() {
+	public void modifyResponseBodyToLarge() {
 		testClient.post()
 			.uri("/post")
 			.header("Host", "www.modifyresponsebodyjavatoolarge.org")
@@ -95,10 +95,10 @@ public class ModifyResponseBodyGatewayFilterFactoryTests extends BaseWebClientTe
 			.body(BodyInserters.fromValue(toLarge))
 			.exchange()
 			.expectStatus()
-			.isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR)
+			.isEqualTo(HttpStatus.PAYLOAD_TOO_LARGE)
 			.expectBody()
-			.jsonPath("message")
-			.isEqualTo("Exceeded limit on max bytes to buffer : 40");
+			.jsonPath("error")
+			.isEqualTo("Payload Too Large");
 	}
 
 	@EnableAutoConfiguration