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 c571dc327e1..0aee387d543 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
@@ -18,6 +18,7 @@ package org.springframework.boot.autoconfigure.jdbc;
 
 import org.springframework.boot.diagnostics.AbstractFailureAnalyzer;
 import org.springframework.boot.diagnostics.FailureAnalysis;
+import org.springframework.jdbc.CannotGetJdbcConnectionException;
 
 /**
  * An {@link AbstractFailureAnalyzer} that performs analysis of a Hikari configuration
@@ -26,14 +27,14 @@ import org.springframework.boot.diagnostics.FailureAnalysis;
  * @author Stephane Nicoll
  */
 class HikariDriverConfigurationFailureAnalyzer
-		extends AbstractFailureAnalyzer<IllegalStateException> {
+		extends AbstractFailureAnalyzer<CannotGetJdbcConnectionException> {
 
-	private static final String EXPECTED_MESSAGE = "cannot use driverClassName and "
-			+ "dataSourceClassName together.";
+	private static final String EXPECTED_MESSAGE = "Failed to obtain JDBC Connection:"
+			+ " cannot use driverClassName and dataSourceClassName together.";
 
 	@Override
 	protected FailureAnalysis analyze(Throwable rootFailure,
-			IllegalStateException cause) {
+			CannotGetJdbcConnectionException cause) {
 		if (!EXPECTED_MESSAGE.equals(cause.getMessage())) {
 			return null;
 		}