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 9cca3915bd..067aedfe6d 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
@@ -25,7 +25,7 @@ import org.springframework.boot.actuate.health.CompositeHealthIndicator;
 import org.springframework.boot.actuate.health.HealthIndicator;
 import org.springframework.boot.actuate.health.MongoHealthIndicator;
 import org.springframework.boot.actuate.health.RedisHealthIndicator;
-import org.springframework.boot.actuate.health.SimpleHealthIndicator;
+import org.springframework.boot.actuate.health.SimpleDataSourceHealthIndicator;
 import org.springframework.boot.actuate.health.VanillaHealthIndicator;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -72,13 +72,13 @@ public class HealthIndicatorAutoConfiguration {
 		@ConditionalOnMissingBean(name = "dbHealthIndicator")
 		public HealthIndicator<? extends Object> dbHealthIndicator() {
 			if (this.dataSources.size() == 1) {
-				return new SimpleHealthIndicator(this.dataSources.values().iterator()
+				return new SimpleDataSourceHealthIndicator(this.dataSources.values().iterator()
 						.next());
 			}
 
 			CompositeHealthIndicator composite = new CompositeHealthIndicator();
 			for (Map.Entry<String, DataSource> entry : this.dataSources.entrySet()) {
-				composite.addHealthIndicator(entry.getKey(), new SimpleHealthIndicator(
+				composite.addHealthIndicator(entry.getKey(), new SimpleDataSourceHealthIndicator(
 						entry.getValue()));
 			}
 			return composite;
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfigurationTests.java
index 9ec1ecef49..9abc4b39e9 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfigurationTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfigurationTests.java
@@ -24,7 +24,7 @@ import org.junit.Test;
 import org.springframework.boot.actuate.health.HealthIndicator;
 import org.springframework.boot.actuate.health.MongoHealthIndicator;
 import org.springframework.boot.actuate.health.RedisHealthIndicator;
-import org.springframework.boot.actuate.health.SimpleHealthIndicator;
+import org.springframework.boot.actuate.health.SimpleDataSourceHealthIndicator;
 import org.springframework.boot.actuate.health.VanillaHealthIndicator;
 import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration;
 import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
@@ -120,7 +120,7 @@ public class HealthIndicatorAutoConfigurationTests {
 		Map<String, HealthIndicator> beans = this.context
 				.getBeansOfType(HealthIndicator.class);
 		assertEquals(1, beans.size());
-		assertEquals(SimpleHealthIndicator.class, beans.values().iterator().next()
+		assertEquals(SimpleDataSourceHealthIndicator.class, beans.values().iterator().next()
 				.getClass());
 	}
 }
\ No newline at end of file
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/SimpleHealthIndicatorTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/SimpleHealthIndicatorTests.java
index 1afb28c78e..d81bac2b26 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/SimpleHealthIndicatorTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/SimpleHealthIndicatorTests.java
@@ -36,13 +36,13 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 /**
- * Tests for {@link SimpleHealthIndicator}.
+ * Tests for {@link SimpleDataSourceHealthIndicator}.
  * 
  * @author Dave Syer
  */
 public class SimpleHealthIndicatorTests {
 
-	private final SimpleHealthIndicator indicator = new SimpleHealthIndicator();
+	private final SimpleDataSourceHealthIndicator indicator = new SimpleDataSourceHealthIndicator();
 	private DriverManagerDataSource dataSource;
 
 	@Before