diff --git a/pom.xml b/pom.xml
index 342f0572..ab7f1aaa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
 
 		<degraph-check.version>0.1.4</degraph-check.version>
 		<postgresql.version>42.2.5</postgresql.version>
-		<mysql.version>5.1.47</mysql.version>
+		<mysql.version>8.0.21</mysql.version>
 		<jasync.version>1.0.14</jasync.version>
 		<r2dbc-mariadb.version>0.8.1-alpha1</r2dbc-mariadb.version>
 		<r2dbc-spi-test.version>0.8.0.RELEASE</r2dbc-spi-test.version>
diff --git a/src/test/java/org/springframework/data/r2dbc/testing/MySqlTestSupport.java b/src/test/java/org/springframework/data/r2dbc/testing/MySqlTestSupport.java
index 08b519f9..dc6593e0 100644
--- a/src/test/java/org/springframework/data/r2dbc/testing/MySqlTestSupport.java
+++ b/src/test/java/org/springframework/data/r2dbc/testing/MySqlTestSupport.java
@@ -29,7 +29,7 @@ import org.springframework.data.r2dbc.testing.ExternalDatabase.ProvidedDatabase;
 import org.testcontainers.containers.MySQLContainer;
 
 import com.github.jasync.r2dbc.mysql.MysqlConnectionFactoryProvider;
-import com.mysql.jdbc.jdbc2.optional.MysqlDataSource;
+import com.mysql.cj.jdbc.MysqlDataSource;
 
 /**
  * Utility class for testing against MySQL.