diff --git a/.github/workflows/ci-4.x.yml b/.github/workflows/ci-4.x.yml
index 3a157f8dee..2a079cb6f8 100644
--- a/.github/workflows/ci-4.x.yml
+++ b/.github/workflows/ci-4.x.yml
@@ -41,19 +41,19 @@ jobs:
             jdk: 8
             profile: 'SQL-templates'
           - os: ubuntu-latest
-            jdk: 17
+            jdk: 25
             profile: 'PostgreSQL-11'
           - os: ubuntu-latest
-            jdk: 17
+            jdk: 25
             profile: 'MySQL-5.7'
           - os: ubuntu-latest
-            jdk: 17
+            jdk: 25
             profile: 'MariaDB-10.4'
           - os: ubuntu-latest
-            jdk: 17
+            jdk: 25
             profile: 'MSSQL-2019-latest'
           - os: ubuntu-latest
-            jdk: 17
+            jdk: 25
             profile: 'Oracle-23'
     uses: ./.github/workflows/ci.yml
     with:
diff --git a/.github/workflows/ci-matrix-5.x.yml b/.github/workflows/ci-matrix-5.x.yml
index 2e64aa345c..530386ea75 100644
--- a/.github/workflows/ci-matrix-5.x.yml
+++ b/.github/workflows/ci-matrix-5.x.yml
@@ -44,19 +44,19 @@ jobs:
             jdk: 11
             profile: 'SQL-templates'
           - os: ubuntu-latest
-            jdk: 21
+            jdk: 25
             profile: 'PostgreSQL-11'
           - os: ubuntu-latest
-            jdk: 21
+            jdk: 25
             profile: 'MySQL-5.7'
           - os: ubuntu-latest
-            jdk: 21
+            jdk: 25
             profile: 'MariaDB-10.4'
           - os: ubuntu-latest
-            jdk: 21
+            jdk: 25
             profile: 'MSSQL-2019-latest'
           - os: ubuntu-latest
-            jdk: 21
+            jdk: 25
             profile: 'Oracle-23'
     uses: ./.github/workflows/ci.yml
     with:
diff --git a/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLTLSTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLTLSTest.java
index 3a748f6265..e1541fa0c0 100644
--- a/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLTLSTest.java
+++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLTLSTest.java
@@ -312,7 +312,9 @@ public void testVerifyIdentityInvalidHostname(TestContext ctx) {
     options.setHost("localhost");
 
     MySQLConnection.connect(vertx, options).onComplete( ctx.asyncAssertFailure(err -> {
-      ctx.assertEquals(err.getMessage(), "No name matching localhost found");
+      String expected = "No name matching localhost found";
+      ctx.assertTrue(err.getMessage().contains(expected), "Was expecting <" + err.getMessage() +
+        "> to contain <" + expected + ">");
     }));
   }