diff --git a/src/test/java/com/zaxxer/hikari/ShutdownTest.java b/src/test/java/com/zaxxer/hikari/ShutdownTest.java
index b399036e..424af6a1 100644
--- a/src/test/java/com/zaxxer/hikari/ShutdownTest.java
+++ b/src/test/java/com/zaxxer/hikari/ShutdownTest.java
@@ -225,7 +225,7 @@ public class ShutdownTest
            ds.getConnection();
        }
        catch (SQLException e) {
-          Assert.assertTrue(e.getMessage().contains("has been shutdown"));
+          Assert.assertTrue(e.getMessage().contains("has been closed."));
        }
    }
 
diff --git a/src/test/java/com/zaxxer/hikari/TestValidation.java b/src/test/java/com/zaxxer/hikari/TestValidation.java
index 0b280af9..e0c8207e 100644
--- a/src/test/java/com/zaxxer/hikari/TestValidation.java
+++ b/src/test/java/com/zaxxer/hikari/TestValidation.java
@@ -184,7 +184,7 @@ public class TestValidation
          Assert.fail();
       }
       catch (IllegalStateException ise) {
-         Assert.assertTrue(ise.getMessage().contains("cannot use"));
+         Assert.assertTrue(ise.getMessage().contains("together"));
       }
    }