diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java
index eeb56a7334..c0c4f703fc 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java
@@ -292,7 +292,7 @@ public class HealthIndicatorAutoConfiguration {
 		private Map<String, JavaMailSenderImpl> mailSenders;
 
 		@Bean
-		@ConditionalOnMissingBean(name = "mailSenderHealthIndicator")
+		@ConditionalOnMissingBean(name = "mailHealthIndicator")
 		public HealthIndicator mailHealthIndicator() {
 			if (this.mailSenders.size() == 1) {
 				JavaMailSenderImpl mailSender = this.mailSenders.values().iterator()
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/MailHealthIndicatorTest.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/MailHealthIndicatorTests.java
similarity index 98%
rename from spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/MailHealthIndicatorTest.java
rename to spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/MailHealthIndicatorTests.java
index 102c291d62..2c4a3aa2fb 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/MailHealthIndicatorTest.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/MailHealthIndicatorTests.java
@@ -40,7 +40,7 @@ import static org.mockito.Mockito.when;
  *
  * @author Johannes Stelzer
  */
-public class MailHealthIndicatorTest {
+public class MailHealthIndicatorTests {
 
 	private JavaMailSenderImpl mailSender;
 	private MailHealthIndicator indicator;