diff --git a/java-cfenv-boot/src/main/java/io/pivotal/cfenv/spring/boot/CfDataSourceEnvironmentPostProcessor.java b/java-cfenv-boot/src/main/java/io/pivotal/cfenv/spring/boot/CfDataSourceEnvironmentPostProcessor.java
index a522564c..f7bee37d 100644
--- a/java-cfenv-boot/src/main/java/io/pivotal/cfenv/spring/boot/CfDataSourceEnvironmentPostProcessor.java
+++ b/java-cfenv-boot/src/main/java/io/pivotal/cfenv/spring/boot/CfDataSourceEnvironmentPostProcessor.java
@@ -37,6 +37,7 @@
 
 /**
  * @author Mark Pollack
+ * @author Thomas Risberg
  */
 public class CfDataSourceEnvironmentPostProcessor implements EnvironmentPostProcessor,
 		Ordered, ApplicationListener<ApplicationEvent> {
@@ -80,7 +81,7 @@ public void postProcessEnvironment(ConfigurableEnvironment environment,
 				properties.put("spring.datasource.username", cfJdbcService.getUsername());
 				properties.put("spring.datasource.password", cfJdbcService.getPassword());
 				Object driverClassName = cfJdbcService.getDriverClassName();
-				if (driverClassName != null) {
+				if (driverClassName != null && ((String)driverClassName).startsWith("org.mariadb.jdbc")) {
 					properties.put("spring.datasource.driver-class-name", driverClassName);
 				}
 
diff --git a/java-cfenv-jdbc/src/main/java/io/pivotal/cfenv/jdbc/MySqlJdbcUrlCreator.java b/java-cfenv-jdbc/src/main/java/io/pivotal/cfenv/jdbc/MySqlJdbcUrlCreator.java
index 07ee02a3..415090e9 100644
--- a/java-cfenv-jdbc/src/main/java/io/pivotal/cfenv/jdbc/MySqlJdbcUrlCreator.java
+++ b/java-cfenv-jdbc/src/main/java/io/pivotal/cfenv/jdbc/MySqlJdbcUrlCreator.java
@@ -21,6 +21,7 @@
 
 /**
  * @author Mark Pollack
+ * @author Thomas Risberg
  */
 public class MySqlJdbcUrlCreator extends AbstractJdbcUrlCreator {
 
@@ -46,11 +47,11 @@ public boolean isDatabaseService(CfService cfService) {
 	public String getDriverClassName() {
 		String driverClassNameToUse = null;
 		try {
-			driverClassNameToUse = "org.mariadb.jdbc.Driver";
+			driverClassNameToUse = "com.mysql.cj.jdbc.Driver";
 			Class.forName(driverClassNameToUse, false, getClass().getClassLoader());
 		} catch (ClassNotFoundException e) {
 			try {
-				driverClassNameToUse = "com.mysql.cj.jdbc.Driver";
+				driverClassNameToUse = "org.mariadb.jdbc.Driver";
 				Class.forName(driverClassNameToUse, false, getClass().getClassLoader());
 			} catch (ClassNotFoundException e2) {
 				return null;