diff --git a/spring-boot-actuator/pom.xml b/spring-boot-actuator/pom.xml
index 650d0a7d3b..3eb06c8c7a 100644
--- a/spring-boot-actuator/pom.xml
+++ b/spring-boot-actuator/pom.xml
@@ -256,7 +256,7 @@
 		</dependency>
 		<dependency>
 			<groupId>com.zaxxer</groupId>
-			<artifactId>HikariCP-java6</artifactId>
+			<artifactId>HikariCP</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
diff --git a/spring-boot-autoconfigure/pom.xml b/spring-boot-autoconfigure/pom.xml
index 7c022f5a7c..45ef4defb2 100755
--- a/spring-boot-autoconfigure/pom.xml
+++ b/spring-boot-autoconfigure/pom.xml
@@ -241,7 +241,7 @@
 		</dependency>
 		<dependency>
 			<groupId>com.zaxxer</groupId>
-			<artifactId>HikariCP-java6</artifactId>
+			<artifactId>HikariCP</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/HikariDriverConfigurationFailureAnalyzer.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/HikariDriverConfigurationFailureAnalyzer.java
index dc552ab1c8..eb8e819944 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/HikariDriverConfigurationFailureAnalyzer.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/HikariDriverConfigurationFailureAnalyzer.java
@@ -28,8 +28,8 @@ import org.springframework.boot.diagnostics.FailureAnalysis;
 class HikariDriverConfigurationFailureAnalyzer
 		extends AbstractFailureAnalyzer<IllegalStateException> {
 
-	private static final String EXPECTED_MESSAGE = "both driverClassName and "
-			+ "dataSourceClassName are specified, one or the other should be used";
+	private static final String EXPECTED_MESSAGE = "cannot use driverClassName and "
+			+ "dataSourceClassName together.";
 
 	@Override
 	protected FailureAnalysis analyze(Throwable rootFailure,
diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 43ced44ab0..a932f5d35d 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -87,7 +87,6 @@
 		<hibernate.version>5.2.5.Final</hibernate.version>
 		<hibernate-validator.version>5.3.4.Final</hibernate-validator.version>
 		<hikaricp.version>2.5.1</hikaricp.version>
-		<hikaricp-java6.version>2.3.13</hikaricp-java6.version>
 		<hsqldb.version>2.3.3</hsqldb.version>
 		<htmlunit.version>2.21</htmlunit.version>
 		<httpasyncclient.version>4.1.2</httpasyncclient.version>
@@ -743,11 +742,6 @@
 				<artifactId>HikariCP</artifactId>
 				<version>${hikaricp.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>com.zaxxer</groupId>
-				<artifactId>HikariCP-java6</artifactId>
-				<version>${hikaricp-java6.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>commons-beanutils</groupId>
 				<artifactId>commons-beanutils</artifactId>