diff --git a/hibernate-types-4/src/test/java/com/vladmihalcea/hibernate/util/providers/MySQLDataSourceProvider.java b/hibernate-types-4/src/test/java/com/vladmihalcea/hibernate/util/providers/MySQLDataSourceProvider.java
index e3cb445d3..a07b3ab8c 100644
--- a/hibernate-types-4/src/test/java/com/vladmihalcea/hibernate/util/providers/MySQLDataSourceProvider.java
+++ b/hibernate-types-4/src/test/java/com/vladmihalcea/hibernate/util/providers/MySQLDataSourceProvider.java
@@ -1,9 +1,9 @@
 package com.vladmihalcea.hibernate.util.providers;
 
-import com.mysql.jdbc.jdbc2.optional.MysqlDataSource;
+import com.mysql.cj.jdbc.MysqlDataSource;
 
 import javax.sql.DataSource;
-import java.util.Properties;
+import java.sql.SQLException;
 
 /**
  * @author Vlad Mihalcea
@@ -81,15 +81,19 @@ protected String defaultJdbcUrl() {
     }
 
     protected DataSource newDataSource() {
-        MysqlDataSource dataSource = new MysqlDataSource();
-        dataSource.setURL(url());
-        dataSource.setUser(username());
-        dataSource.setPassword(password());
-        dataSource.setRewriteBatchedStatements(rewriteBatchedStatements);
-        dataSource.setCachePrepStmts(cachePrepStmts);
-        dataSource.setUseServerPrepStmts(useServerPrepStmts);
-
-        return dataSource;
+        try {
+            MysqlDataSource dataSource = new MysqlDataSource();
+            dataSource.setURL(url());
+            dataSource.setUser(username());
+            dataSource.setPassword(password());
+            dataSource.setRewriteBatchedStatements(rewriteBatchedStatements);
+            dataSource.setCachePrepStmts(cachePrepStmts);
+            dataSource.setUseServerPrepStmts(useServerPrepStmts);
+
+            return dataSource;
+        } catch (SQLException e) {
+            throw new IllegalStateException("The DataSource could not be instantiated!");
+        }
     }
 
     @Override
diff --git a/hibernate-types-4/src/test/java/com/vladmihalcea/hibernate/util/providers/SQLServerDataSourceProvider.java b/hibernate-types-4/src/test/java/com/vladmihalcea/hibernate/util/providers/SQLServerDataSourceProvider.java
index a28e517be..c193d945d 100644
--- a/hibernate-types-4/src/test/java/com/vladmihalcea/hibernate/util/providers/SQLServerDataSourceProvider.java
+++ b/hibernate-types-4/src/test/java/com/vladmihalcea/hibernate/util/providers/SQLServerDataSourceProvider.java
@@ -18,7 +18,7 @@ public String hibernateDialect() {
 
 	@Override
 	public String defaultJdbcUrl() {
-		return "jdbc:sqlserver://localhost;instance=SQLEXPRESS;databaseName=high_performance_java_persistence;user=sa;password=adm1n";
+		return "jdbc:sqlserver://localhost;instance=SQLEXPRESS;databaseName=high_performance_java_persistence;encrypt=true;trustServerCertificate=true";
 	}
 
 	@Override
diff --git a/hibernate-types-43/src/test/java/com/vladmihalcea/hibernate/util/providers/MySQLDataSourceProvider.java b/hibernate-types-43/src/test/java/com/vladmihalcea/hibernate/util/providers/MySQLDataSourceProvider.java
index e3cb445d3..a07b3ab8c 100644
--- a/hibernate-types-43/src/test/java/com/vladmihalcea/hibernate/util/providers/MySQLDataSourceProvider.java
+++ b/hibernate-types-43/src/test/java/com/vladmihalcea/hibernate/util/providers/MySQLDataSourceProvider.java
@@ -1,9 +1,9 @@
 package com.vladmihalcea.hibernate.util.providers;
 
-import com.mysql.jdbc.jdbc2.optional.MysqlDataSource;
+import com.mysql.cj.jdbc.MysqlDataSource;
 
 import javax.sql.DataSource;
-import java.util.Properties;
+import java.sql.SQLException;
 
 /**
  * @author Vlad Mihalcea
@@ -81,15 +81,19 @@ protected String defaultJdbcUrl() {
     }
 
     protected DataSource newDataSource() {
-        MysqlDataSource dataSource = new MysqlDataSource();
-        dataSource.setURL(url());
-        dataSource.setUser(username());
-        dataSource.setPassword(password());
-        dataSource.setRewriteBatchedStatements(rewriteBatchedStatements);
-        dataSource.setCachePrepStmts(cachePrepStmts);
-        dataSource.setUseServerPrepStmts(useServerPrepStmts);
-
-        return dataSource;
+        try {
+            MysqlDataSource dataSource = new MysqlDataSource();
+            dataSource.setURL(url());
+            dataSource.setUser(username());
+            dataSource.setPassword(password());
+            dataSource.setRewriteBatchedStatements(rewriteBatchedStatements);
+            dataSource.setCachePrepStmts(cachePrepStmts);
+            dataSource.setUseServerPrepStmts(useServerPrepStmts);
+
+            return dataSource;
+        } catch (SQLException e) {
+            throw new IllegalStateException("The DataSource could not be instantiated!");
+        }
     }
 
     @Override
diff --git a/hibernate-types-43/src/test/java/com/vladmihalcea/hibernate/util/providers/SQLServerDataSourceProvider.java b/hibernate-types-43/src/test/java/com/vladmihalcea/hibernate/util/providers/SQLServerDataSourceProvider.java
index a28e517be..c193d945d 100644
--- a/hibernate-types-43/src/test/java/com/vladmihalcea/hibernate/util/providers/SQLServerDataSourceProvider.java
+++ b/hibernate-types-43/src/test/java/com/vladmihalcea/hibernate/util/providers/SQLServerDataSourceProvider.java
@@ -18,7 +18,7 @@ public String hibernateDialect() {
 
 	@Override
 	public String defaultJdbcUrl() {
-		return "jdbc:sqlserver://localhost;instance=SQLEXPRESS;databaseName=high_performance_java_persistence;user=sa;password=adm1n";
+		return "jdbc:sqlserver://localhost;instance=SQLEXPRESS;databaseName=high_performance_java_persistence;encrypt=true;trustServerCertificate=true";
 	}
 
 	@Override
diff --git a/hibernate-types-5/src/test/java/com/vladmihalcea/hibernate/util/providers/MySQLDataSourceProvider.java b/hibernate-types-5/src/test/java/com/vladmihalcea/hibernate/util/providers/MySQLDataSourceProvider.java
index e3cb445d3..a07b3ab8c 100644
--- a/hibernate-types-5/src/test/java/com/vladmihalcea/hibernate/util/providers/MySQLDataSourceProvider.java
+++ b/hibernate-types-5/src/test/java/com/vladmihalcea/hibernate/util/providers/MySQLDataSourceProvider.java
@@ -1,9 +1,9 @@
 package com.vladmihalcea.hibernate.util.providers;
 
-import com.mysql.jdbc.jdbc2.optional.MysqlDataSource;
+import com.mysql.cj.jdbc.MysqlDataSource;
 
 import javax.sql.DataSource;
-import java.util.Properties;
+import java.sql.SQLException;
 
 /**
  * @author Vlad Mihalcea
@@ -81,15 +81,19 @@ protected String defaultJdbcUrl() {
     }
 
     protected DataSource newDataSource() {
-        MysqlDataSource dataSource = new MysqlDataSource();
-        dataSource.setURL(url());
-        dataSource.setUser(username());
-        dataSource.setPassword(password());
-        dataSource.setRewriteBatchedStatements(rewriteBatchedStatements);
-        dataSource.setCachePrepStmts(cachePrepStmts);
-        dataSource.setUseServerPrepStmts(useServerPrepStmts);
-
-        return dataSource;
+        try {
+            MysqlDataSource dataSource = new MysqlDataSource();
+            dataSource.setURL(url());
+            dataSource.setUser(username());
+            dataSource.setPassword(password());
+            dataSource.setRewriteBatchedStatements(rewriteBatchedStatements);
+            dataSource.setCachePrepStmts(cachePrepStmts);
+            dataSource.setUseServerPrepStmts(useServerPrepStmts);
+
+            return dataSource;
+        } catch (SQLException e) {
+            throw new IllegalStateException("The DataSource could not be instantiated!");
+        }
     }
 
     @Override
diff --git a/hibernate-types-5/src/test/java/com/vladmihalcea/hibernate/util/providers/SQLServerDataSourceProvider.java b/hibernate-types-5/src/test/java/com/vladmihalcea/hibernate/util/providers/SQLServerDataSourceProvider.java
index a28e517be..c193d945d 100644
--- a/hibernate-types-5/src/test/java/com/vladmihalcea/hibernate/util/providers/SQLServerDataSourceProvider.java
+++ b/hibernate-types-5/src/test/java/com/vladmihalcea/hibernate/util/providers/SQLServerDataSourceProvider.java
@@ -18,7 +18,7 @@ public String hibernateDialect() {
 
 	@Override
 	public String defaultJdbcUrl() {
-		return "jdbc:sqlserver://localhost;instance=SQLEXPRESS;databaseName=high_performance_java_persistence;user=sa;password=adm1n";
+		return "jdbc:sqlserver://localhost;instance=SQLEXPRESS;databaseName=high_performance_java_persistence;encrypt=true;trustServerCertificate=true";
 	}
 
 	@Override
diff --git a/hibernate-types-52/src/test/java/com/vladmihalcea/hibernate/util/providers/MySQLDataSourceProvider.java b/hibernate-types-52/src/test/java/com/vladmihalcea/hibernate/util/providers/MySQLDataSourceProvider.java
index c93759695..8ca7f702c 100644
--- a/hibernate-types-52/src/test/java/com/vladmihalcea/hibernate/util/providers/MySQLDataSourceProvider.java
+++ b/hibernate-types-52/src/test/java/com/vladmihalcea/hibernate/util/providers/MySQLDataSourceProvider.java
@@ -4,7 +4,6 @@
 
 import javax.sql.DataSource;
 import java.sql.SQLException;
-import java.util.Properties;
 
 /**
  * @author Vlad Mihalcea
diff --git a/hibernate-types-52/src/test/java/com/vladmihalcea/hibernate/util/providers/SQLServerDataSourceProvider.java b/hibernate-types-52/src/test/java/com/vladmihalcea/hibernate/util/providers/SQLServerDataSourceProvider.java
index a28e517be..c193d945d 100644
--- a/hibernate-types-52/src/test/java/com/vladmihalcea/hibernate/util/providers/SQLServerDataSourceProvider.java
+++ b/hibernate-types-52/src/test/java/com/vladmihalcea/hibernate/util/providers/SQLServerDataSourceProvider.java
@@ -18,7 +18,7 @@ public String hibernateDialect() {
 
 	@Override
 	public String defaultJdbcUrl() {
-		return "jdbc:sqlserver://localhost;instance=SQLEXPRESS;databaseName=high_performance_java_persistence;user=sa;password=adm1n";
+		return "jdbc:sqlserver://localhost;instance=SQLEXPRESS;databaseName=high_performance_java_persistence;encrypt=true;trustServerCertificate=true";
 	}
 
 	@Override
diff --git a/hibernate-types-55/src/test/java/com/vladmihalcea/hibernate/util/providers/SQLServerDataSourceProvider.java b/hibernate-types-55/src/test/java/com/vladmihalcea/hibernate/util/providers/SQLServerDataSourceProvider.java
index a28e517be..c193d945d 100644
--- a/hibernate-types-55/src/test/java/com/vladmihalcea/hibernate/util/providers/SQLServerDataSourceProvider.java
+++ b/hibernate-types-55/src/test/java/com/vladmihalcea/hibernate/util/providers/SQLServerDataSourceProvider.java
@@ -18,7 +18,7 @@ public String hibernateDialect() {
 
 	@Override
 	public String defaultJdbcUrl() {
-		return "jdbc:sqlserver://localhost;instance=SQLEXPRESS;databaseName=high_performance_java_persistence;user=sa;password=adm1n";
+		return "jdbc:sqlserver://localhost;instance=SQLEXPRESS;databaseName=high_performance_java_persistence;encrypt=true;trustServerCertificate=true";
 	}
 
 	@Override
diff --git a/hibernate-types-60/src/test/java/com/vladmihalcea/hibernate/util/providers/MySQLDataSourceProvider.java b/hibernate-types-60/src/test/java/com/vladmihalcea/hibernate/util/providers/MySQLDataSourceProvider.java
index 06211b9ad..ca07d990d 100644
--- a/hibernate-types-60/src/test/java/com/vladmihalcea/hibernate/util/providers/MySQLDataSourceProvider.java
+++ b/hibernate-types-60/src/test/java/com/vladmihalcea/hibernate/util/providers/MySQLDataSourceProvider.java
@@ -5,7 +5,6 @@
 
 import javax.sql.DataSource;
 import java.sql.SQLException;
-import java.util.Properties;
 
 /**
  * @author Vlad Mihalcea
diff --git a/hibernate-types-60/src/test/java/com/vladmihalcea/hibernate/util/providers/SQLServerDataSourceProvider.java b/hibernate-types-60/src/test/java/com/vladmihalcea/hibernate/util/providers/SQLServerDataSourceProvider.java
index e8d4f62d2..3588e85f4 100644
--- a/hibernate-types-60/src/test/java/com/vladmihalcea/hibernate/util/providers/SQLServerDataSourceProvider.java
+++ b/hibernate-types-60/src/test/java/com/vladmihalcea/hibernate/util/providers/SQLServerDataSourceProvider.java
@@ -19,7 +19,7 @@ public String hibernateDialect() {
 
 	@Override
 	public String defaultJdbcUrl() {
-		return "jdbc:sqlserver://localhost;instance=SQLEXPRESS;databaseName=high_performance_java_persistence;user=sa;password=adm1n";
+		return "jdbc:sqlserver://localhost;instance=SQLEXPRESS;databaseName=high_performance_java_persistence;encrypt=true;trustServerCertificate=true";
 	}
 
 	@Override
diff --git a/pom.xml b/pom.xml
index 704db376f..1b92f8576 100644
--- a/pom.xml
+++ b/pom.xml
@@ -417,9 +417,9 @@
         <hsqldb.version>2.2.8</hsqldb.version>
         <h2.version>1.4.200</h2.version>
         <postgresql.version>42.4.1</postgresql.version>
-        <mysql.version>5.1.47</mysql.version>
+        <mysql.version>8.0.30</mysql.version>
         <oracle.version>21.5.0.0</oracle.version>
-        <mssql.version>6.4.0.jre8</mssql.version>
+        <mssql.version>11.2.1.jre8</mssql.version>
 
     </properties>