diff --git a/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/health/RedisHealthContributorAutoConfigurationTests.java b/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/health/DataRedisHealthContributorAutoConfigurationTests.java
similarity index 97%
rename from module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/health/RedisHealthContributorAutoConfigurationTests.java
rename to module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/health/DataRedisHealthContributorAutoConfigurationTests.java
index f2d1e10594a..b8778e67607 100644
--- a/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/health/RedisHealthContributorAutoConfigurationTests.java
+++ b/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/health/DataRedisHealthContributorAutoConfigurationTests.java
@@ -34,7 +34,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @author Phillip Webb
  */
 @ClassPathExclusions({ "reactor-core*.jar", "lettuce-core*.jar" })
-class RedisHealthContributorAutoConfigurationTests {
+class DataRedisHealthContributorAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 		.withConfiguration(AutoConfigurations.of(DataRedisAutoConfiguration.class,
diff --git a/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/health/RedisReactiveHealthContributorAutoConfigurationTests.java b/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/health/DataRedisReactiveHealthContributorAutoConfigurationTests.java
similarity index 97%
rename from module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/health/RedisReactiveHealthContributorAutoConfigurationTests.java
rename to module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/health/DataRedisReactiveHealthContributorAutoConfigurationTests.java
index 9a1999a0daa..e7087b60cfd 100644
--- a/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/health/RedisReactiveHealthContributorAutoConfigurationTests.java
+++ b/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/health/DataRedisReactiveHealthContributorAutoConfigurationTests.java
@@ -32,7 +32,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  *
  * @author Phillip Webb
  */
-class RedisReactiveHealthContributorAutoConfigurationTests {
+class DataRedisReactiveHealthContributorAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 		.withConfiguration(AutoConfigurations.of(DataRedisAutoConfiguration.class,
diff --git a/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/health/RedisReactiveHealthIndicatorTests.java b/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/health/DataRedisReactiveHealthIndicatorTests.java
similarity index 99%
rename from module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/health/RedisReactiveHealthIndicatorTests.java
rename to module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/health/DataRedisReactiveHealthIndicatorTests.java
index fe45c617a87..6770ca38389 100644
--- a/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/health/RedisReactiveHealthIndicatorTests.java
+++ b/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/health/DataRedisReactiveHealthIndicatorTests.java
@@ -48,7 +48,7 @@ import static org.mockito.Mockito.mock;
  * @author Artsiom Yudovin
  * @author Scott Frederick
  */
-class RedisReactiveHealthIndicatorTests {
+class DataRedisReactiveHealthIndicatorTests {
 
 	@Test
 	void redisIsUp() {
diff --git a/module/spring-boot-security/src/test/java/org/springframework/boot/security/autoconfigure/web/reactive/ReactiveSecurityAutoConfigurationTests.java b/module/spring-boot-security/src/test/java/org/springframework/boot/security/autoconfigure/web/reactive/ReactiveWebSecurityAutoConfigurationTests.java
similarity index 98%
rename from module/spring-boot-security/src/test/java/org/springframework/boot/security/autoconfigure/web/reactive/ReactiveSecurityAutoConfigurationTests.java
rename to module/spring-boot-security/src/test/java/org/springframework/boot/security/autoconfigure/web/reactive/ReactiveWebSecurityAutoConfigurationTests.java
index bae8e532f8f..cc97c9fb9b3 100644
--- a/module/spring-boot-security/src/test/java/org/springframework/boot/security/autoconfigure/web/reactive/ReactiveSecurityAutoConfigurationTests.java
+++ b/module/spring-boot-security/src/test/java/org/springframework/boot/security/autoconfigure/web/reactive/ReactiveWebSecurityAutoConfigurationTests.java
@@ -40,7 +40,7 @@ import static org.mockito.Mockito.mock;
  *
  * @author Madhura Bhave
  */
-class ReactiveSecurityAutoConfigurationTests {
+class ReactiveWebSecurityAutoConfigurationTests {
 
 	private final ReactiveWebApplicationContextRunner contextRunner = new ReactiveWebApplicationContextRunner()
 		.withConfiguration(AutoConfigurations.of(ReactiveWebSecurityAutoConfiguration.class));