diff --git a/src/main/config/setup.properties.example b/src/main/config/setup.properties.example
index 15aafc90..6e97c5b6 100644
--- a/src/main/config/setup.properties.example
+++ b/src/main/config/setup.properties.example
@@ -22,8 +22,7 @@ port           = 4848
 !db.logging     = FINE
 
 # MySQL
-db.driver      = com.mysql.jdbc.jdbc2.optional.MysqlDataSource
-!db.driver     = mysql-connector-java-5.1.30-bin.jar_com.mysql.jdbc.Driver_5_1
+db.driver      = com.mysql.cj.jdbc.MysqlDataSource
 db.url         = jdbc:mysql://localhost:3306/icat
 db.username    = icat
 db.password    = secret
diff --git a/src/test/scripts/prepare_test.py b/src/test/scripts/prepare_test.py
index e7a5a731..f2bb8cf1 100644
--- a/src/test/scripts/prepare_test.py
+++ b/src/test/scripts/prepare_test.py
@@ -56,7 +56,7 @@
             "home           = %s" % containerHome,
             "port           = 4848",
             "# MySQL",
-            "db.driver      = com.mysql.jdbc.jdbc2.optional.MysqlDataSource",
+            "db.driver      = com.mysql.cj.jdbc.MysqlDataSource",
             "db.url         = jdbc:mysql://localhost:3306/icatdb",
             "db.username    = icatdbuser",
             "db.password    = icatdbuserpw"