diff --git a/node/src/main/java/CordaCaplet.java b/node/src/main/java/CordaCaplet.java
index 3d8b689ae7..86dffc2f6a 100644
--- a/node/src/main/java/CordaCaplet.java
+++ b/node/src/main/java/CordaCaplet.java
@@ -92,6 +92,7 @@ public class CordaCaplet extends Capsule {
 
             (new File(baseDir, "cordapps")).mkdir();
             // Add additional directories of JARs to the classpath (at the end). e.g. for JDBC drivers
+            augmentClasspath((List<Path>) cp, new File(baseDir, "drivers"));
             try {
                 List<String> jarDirs = nodeConfig.getStringList("jarDirs");
                 log(LOG_VERBOSE, "Configured JAR directories = " + jarDirs);
diff --git a/node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt b/node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
index 8844b7093f..81e4015640 100644
--- a/node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
+++ b/node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
@@ -906,8 +906,12 @@ fun configureDatabase(hikariProperties: Properties,
     JavaTypeDescriptorRegistry.INSTANCE.addDescriptor(AbstractPartyDescriptor(identityService))
     val dataSource = DataSourceFactory.createDataSource(hikariProperties)
     val attributeConverters = listOf(AbstractPartyToX500NameAsStringConverter(identityService))
-
     val jdbcUrl = hikariProperties.getProperty("dataSource.url", "")
-    SchemaMigration(schemaService.schemaOptions.keys, dataSource, !isH2Database(jdbcUrl), databaseConfig).nodeStartup()
-    return CordaPersistence(dataSource, databaseConfig, schemaService.schemaOptions.keys, attributeConverters, cordappClassLoader)
+    SchemaMigration(
+            schemaService.schemaOptions.keys,
+            dataSource,
+            !isH2Database(jdbcUrl),
+            databaseConfig,
+            cordappClassLoader ?: Thread.currentThread().contextClassLoader).nodeStartup()
+    return CordaPersistence(dataSource, databaseConfig, schemaService.schemaOptions.keys, jdbcUrl, attributeConverters, cordappClassLoader)
 }
diff --git a/testing/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeProcess.kt b/testing/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeProcess.kt
index 64da916290..e4c86ada06 100644
--- a/testing/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeProcess.kt
+++ b/testing/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeProcess.kt
@@ -112,7 +112,7 @@ class NodeProcess(
         }
 
         fun setupPlugins(config: NodeConfig, jarPaths: List<String>): Factory {
-            (baseDirectory(config) / "plugins").createDirectories().also {
+            (baseDirectory(config) / "drivers").createDirectories().also {
                 jarPaths.forEach { jar -> Paths.get(jar).copyToDirectory(it) }
             }
             return this