diff --git a/spring-cloud-gateway-server-webflux/src/test/java/org/springframework/cloud/gateway/test/HttpStatusTests.java b/spring-cloud-gateway-server-webflux/src/test/java/org/springframework/cloud/gateway/test/HttpStatusTests.java
index 80df69bb36..330f19d61e 100644
--- a/spring-cloud-gateway-server-webflux/src/test/java/org/springframework/cloud/gateway/test/HttpStatusTests.java
+++ b/spring-cloud-gateway-server-webflux/src/test/java/org/springframework/cloud/gateway/test/HttpStatusTests.java
@@ -86,8 +86,15 @@ void normalErrorPageWorks() {
 			.expectStatus()
 			.isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR)
 			.expectBody(Map.class)
-			.consumeWith(result -> assertThat(result.getResponseBody()).hasSizeGreaterThanOrEqualTo(5)
-				.containsKeys("timestamp", "path", "status", "error", "message"));
+			.consumeWith(result -> {
+				Map<String, Object> body = result.getResponseBody();
+
+				assertThat(body)
+						.hasSizeGreaterThanOrEqualTo(5)
+						.containsKeys("timestamp", "path", "status", "error");
+
+				assertThat(body.keySet()).containsAnyOf("message", "requestId");
+			});
 	}
 
 	@EnableAutoConfiguration