diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/AdhocTestSuite.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/AdhocTestSuite.java
index db3560a4..a38c8df3 100644
--- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/AdhocTestSuite.java
+++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/AdhocTestSuite.java
@@ -52,6 +52,7 @@ import static org.junit.Assume.assumeThat;
 		org.springframework.cloud.gateway.handler.predicate.PathRoutePredicateFactoryTests.class,
 		org.springframework.cloud.gateway.handler.predicate.CloudFoundryRouteServiceRoutePredicateFactoryTest.class,
 		org.springframework.cloud.gateway.handler.RoutePredicateHandlerMappingTests.class,
+		org.springframework.cloud.gateway.filter.factory.RewriteResponseHeaderGatewayFilterFactoryTests.class,
 		org.springframework.cloud.gateway.filter.factory.HystrixGatewayFilterFactoryTests.class,
 		org.springframework.cloud.gateway.filter.factory.SecureHeadersGatewayFilterFactoryTests.class,
 		org.springframework.cloud.gateway.filter.factory.RedirectToGatewayFilterFactoryTests.class,
@@ -59,6 +60,7 @@ import static org.junit.Assume.assumeThat;
 		org.springframework.cloud.gateway.filter.factory.RemoveRequestHeaderGatewayFilterFactoryTests.class,
 		org.springframework.cloud.gateway.filter.factory.SetPathGatewayFilterFactoryTests.class,
 		org.springframework.cloud.gateway.filter.factory.PrefixPathGatewayFilterFactoryTest.class,
+		org.springframework.cloud.gateway.filter.factory.RewriteResponseHeaderGatewayFilterFactoryUnitTests.class,
 		org.springframework.cloud.gateway.filter.factory.RequestRateLimiterGatewayFilterFactoryTests.class,
 		org.springframework.cloud.gateway.filter.factory.RequestHeaderToRequestUriGatewayFilterFactoryIntegrationTests.class,
 		org.springframework.cloud.gateway.filter.factory.RemoveResponseHeaderGatewayFilterFactoryTests.class,
@@ -76,7 +78,6 @@ import static org.junit.Assume.assumeThat;
 		org.springframework.cloud.gateway.filter.factory.RewritePathGatewayFilterFactoryIntegrationTests.class,
 		org.springframework.cloud.gateway.filter.factory.AddRequestHeaderGatewayFilterFactoryTests.class,
 		org.springframework.cloud.gateway.filter.factory.SetResponseHeaderGatewayFilterFactoryTests.class,
-		org.springframework.cloud.gateway.filter.factory.RewriteResponseHeaderGatewayFilterFactoryTests.class,
 		org.springframework.cloud.gateway.filter.WeightCalculatorWebFilterTests.class,
 		org.springframework.cloud.gateway.filter.RouteToRequestUrlFilterTests.class,
 		org.springframework.cloud.gateway.filter.headers.ForwardedHeadersFilterTests.class,
@@ -113,7 +114,9 @@ import static org.junit.Assume.assumeThat;
 		org.springframework.cloud.gateway.test.ForwardTests.class,
 		org.springframework.cloud.gateway.test.PostTests.class,
 		org.springframework.cloud.gateway.test.ssl.SingleCertSSLTests.class,
+		org.springframework.cloud.gateway.test.ssl.SSLHandshakeTimeoutDeprecatedTests.class,
 		org.springframework.cloud.gateway.test.ssl.MultiCertSSLTests.class,
+		org.springframework.cloud.gateway.test.ssl.SSLHandshakeTimeoutTests.class,
 		org.springframework.cloud.gateway.test.websocket.WebSocketIntegrationTests.class,
 		org.springframework.cloud.gateway.test.WebfluxNotIncludedTests.class,
 		org.springframework.cloud.gateway.test.HttpStatusTests.class,