diff --git a/storage/connect/JavaWrappers.jar b/storage/connect/JavaWrappers.jar
index d5353d2cbfd..8c01c364a3f 100644
Binary files a/storage/connect/JavaWrappers.jar and b/storage/connect/JavaWrappers.jar differ
diff --git a/storage/connect/JdbcInterface.java b/storage/connect/JdbcInterface.java
index 07dcaf985b4..a1b1360e6ea 100644
--- a/storage/connect/JdbcInterface.java
+++ b/storage/connect/JdbcInterface.java
@@ -82,6 +82,9 @@ public class JdbcInterface {
 		  System.out.println("URL=" + parms[1]);
 	    
 	    CheckURL(parms[1], null);
+	    
+	    // This is required for drivers using context class loaders
+	    Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
 	      
     	if (parms[2] != null && !parms[2].isEmpty()) {
   	      if (DEBUG)
diff --git a/storage/connect/mysql-test/connect/std_data/JdbcMariaDB.jar b/storage/connect/mysql-test/connect/std_data/JdbcMariaDB.jar
index 9d461ad6223..8525da74018 100644
Binary files a/storage/connect/mysql-test/connect/std_data/JdbcMariaDB.jar and b/storage/connect/mysql-test/connect/std_data/JdbcMariaDB.jar differ