diff --git a/hibernate-hikaricp/src/test/java/org/hibernate/test/hikaricp/HikariCPConnectionProviderTest.java b/hibernate-hikaricp/src/test/java/org/hibernate/test/hikaricp/HikariCPConnectionProviderTest.java
index 9693c2de3c..de38961c20 100644
--- a/hibernate-hikaricp/src/test/java/org/hibernate/test/hikaricp/HikariCPConnectionProviderTest.java
+++ b/hibernate-hikaricp/src/test/java/org/hibernate/test/hikaricp/HikariCPConnectionProviderTest.java
@@ -56,7 +56,7 @@ public class HikariCPConnectionProviderTest extends BaseCoreFunctionalTestCase {
 		}
 		catch (SQLException e) {
 			// expected
-			assertTrue( e.getMessage().contains( "Timeout" ) );
+			assertTrue( e.getMessage().contains( "Connection is not available, request timed out after" ) );
 		}
 
 		for ( Connection conn : conns ) {
@@ -72,7 +72,7 @@ public class HikariCPConnectionProviderTest extends BaseCoreFunctionalTestCase {
 		}
 		catch (Exception e) {
 			// expected
-			assertTrue( e.getMessage().contains( "shutdown" ) );
+			assertTrue( e.getMessage().contains( "has been closed" ) );
 		}
 	}
 }
diff --git a/libraries.gradle b/libraries.gradle
index 2ba176b322..6ba206c519 100644
--- a/libraries.gradle
+++ b/libraries.gradle
@@ -122,7 +122,7 @@ ext {
             ehcache3:        "org.ehcache:ehcache:3.0.0",
             jcache:          "javax.cache:cache-api:1.0.0",
             proxool:         "proxool:proxool:0.8.3",
-            hikaricp:        "com.zaxxer:HikariCP-java6:2.3.9",
+            hikaricp:        "com.zaxxer:HikariCP:2.5.1",
 
             // Arquillian/Shrinkwrap
             arquillian_junit_container: "org.jboss.arquillian.junit:arquillian-junit-container:${arquillianVersion}",