diff --git a/bin/jmeter.properties b/bin/jmeter.properties
index 24a6798e4c0..bac04e85bc9 100644
--- a/bin/jmeter.properties
+++ b/bin/jmeter.properties
@@ -807,7 +807,7 @@ wmlParser.types=text/vnd.wap.wml
 # Database validation query
 # based in https://stackoverflow.com/questions/10684244/dbcp-validationquery-for-different-databases list
 jdbc.config.check.query=select 1 from INFORMATION_SCHEMA.SYSTEM_USERS|select 1 from dual|select 1 from sysibm.sysdummy1|select 1|select 1 from rdb$database
-jdbc.config.jdbc.driver.class=com.mysql.jdbc.Driver|org.postgresql.Driver|oracle.jdbc.OracleDriver|com.ingres.jdbc.IngresDriver|com.microsoft.sqlserver.jdbc.SQLServerDriver|com.microsoft.jdbc.sqlserver.SQLServerDriver|org.apache.derby.jdbc.ClientDriver|org.hsqldb.jdbc.JDBCDriver|com.ibm.db2.jcc.DB2Driver|org.apache.derby.jdbc.ClientDriver|org.h2.Driver|org.firebirdsql.jdbc.FBDriver|org.mariadb.jdbc.Driver|org.sqlite.JDBC|net.sourceforge.jtds.jdbc.Driver|com.exasol.jdbc.EXADriver
+jdbc.config.jdbc.driver.class=com.mysql.cj.jdbc.Driver|com.mysql.jdbc.Driver|org.postgresql.Driver|oracle.jdbc.OracleDriver|com.ingres.jdbc.IngresDriver|com.microsoft.sqlserver.jdbc.SQLServerDriver|com.microsoft.jdbc.sqlserver.SQLServerDriver|org.apache.derby.jdbc.ClientDriver|org.hsqldb.jdbc.JDBCDriver|com.ibm.db2.jcc.DB2Driver|org.apache.derby.jdbc.ClientDriver|org.h2.Driver|org.firebirdsql.jdbc.FBDriver|org.mariadb.jdbc.Driver|org.sqlite.JDBC|net.sourceforge.jtds.jdbc.Driver|com.exasol.jdbc.EXADriver
 
 #---------------------------------------------------------------------------
 # OS Process Sampler configuration
diff --git a/xdocs/usermanual/component_reference.xml b/xdocs/usermanual/component_reference.xml
index 5733903554f..c91719f909d 100644
--- a/xdocs/usermanual/component_reference.xml
+++ b/xdocs/usermanual/component_reference.xml
@@ -4104,7 +4104,7 @@ instead. (see figures 12 and 13).</p>
               <dt>hsqldb</dt><dd>org.hsqldb.jdbc.JDBCDriver</dd>
               <dt>Oracle</dt><dd>oracle.jdbc.OracleDriver</dd>
               <dt>DB2</dt><dd>com.ibm.db2.jcc.DB2Driver</dd>
-              <dt>MySQL</dt><dd>com.mysql.jdbc.Driver</dd>
+              <dt>MySQL</dt><dd>com.mysql.cj.jdbc.Driver</dd><dd>com.mysql.jdbc.Driver (deprecated)</dd>
               <dt>Microsoft SQL Server (MS JDBC driver)</dt><dd>com.microsoft.sqlserver.jdbc.SQLServerDriver or com.microsoft.jdbc.sqlserver.SQLServerDriver</dd>
               <dt>PostgreSQL</dt><dd>org.postgresql.Driver</dd>
               <dt>Ingres</dt><dd>com.ingres.jdbc.IngresDriver</dd>