diff --git a/bridge/bridgecapsule/src/smoke-test/kotlin/net/corda/bridge/smoketest/BridgeSmokeTest.kt b/bridge/bridgecapsule/src/smoke-test/kotlin/net/corda/bridge/smoketest/BridgeSmokeTest.kt
index 4ffebf5645..3fc1d131e9 100644
--- a/bridge/bridgecapsule/src/smoke-test/kotlin/net/corda/bridge/smoketest/BridgeSmokeTest.kt
+++ b/bridge/bridgecapsule/src/smoke-test/kotlin/net/corda/bridge/smoketest/BridgeSmokeTest.kt
@@ -130,7 +130,7 @@ class BridgeSmokeTest {
             setPrivateKey(
                     X509Utilities.CORDA_CLIENT_TLS,
                     tlsKeyPair.private,
-                    listOf(tlsCert, nodeCaCert, intermediateCa.certificate, rootCert))
+                    listOf(tlsCert, nodeCaCert, intermediateCa.certificate, rootCert), sslKeyStore.entryPassword)
         }
     }
 
diff --git a/bridge/src/integration-test/kotlin/net/corda/bridge/services/AMQPListenerTest.kt b/bridge/src/integration-test/kotlin/net/corda/bridge/services/AMQPListenerTest.kt
index 63bfbeae50..3b674e8944 100644
--- a/bridge/src/integration-test/kotlin/net/corda/bridge/services/AMQPListenerTest.kt
+++ b/bridge/src/integration-test/kotlin/net/corda/bridge/services/AMQPListenerTest.kt
@@ -62,10 +62,10 @@ class AMQPListenerTest {
         val trustStoreBytes = bridgeConfig.p2pSslOptions.trustStore.path.readAll()
         // start listening
         amqpListenerService.provisionKeysAndActivate(keyStoreBytes,
-                bridgeConfig.p2pSslOptions.keyStore.password.toCharArray(),
-                bridgeConfig.p2pSslOptions.keyStore.password.toCharArray(),
+                bridgeConfig.p2pSslOptions.keyStore.storePassword.toCharArray(),
+                bridgeConfig.p2pSslOptions.keyStore.entryPassword.toCharArray(),
                 trustStoreBytes,
-                bridgeConfig.p2pSslOptions.trustStore.password.toCharArray())
+                bridgeConfig.p2pSslOptions.trustStore.storePassword.toCharArray())
         // Fire lots of activity to prove we are good
         assertEquals(TestAuditService.AuditEvent.STATUS_CHANGE, auditFollower.next())
         assertEquals(true, amqpListenerService.active)
@@ -137,21 +137,21 @@ class AMQPListenerTest {
         val trustStoreBytes = bridgeConfig.p2pSslOptions.trustStore.path.readAll()
         // start listening
         amqpListenerService.provisionKeysAndActivate(keyStoreBytes,
-                bridgeConfig.p2pSslOptions.keyStore.password.toCharArray(),
-                bridgeConfig.p2pSslOptions.keyStore.password.toCharArray(),
+                bridgeConfig.p2pSslOptions.keyStore.storePassword.toCharArray(),
+                bridgeConfig.p2pSslOptions.keyStore.entryPassword.toCharArray(),
                 trustStoreBytes,
-                bridgeConfig.p2pSslOptions.trustStore.password.toCharArray())
+                bridgeConfig.p2pSslOptions.trustStore.storePassword.toCharArray())
         val connectionFollower = amqpListenerService.onConnection.toBlocking().iterator
         val auditFollower = auditService.onAuditEvent.toBlocking().iterator
         val clientKeys = Crypto.generateKeyPair(ECDSA_SECP256R1_SHA256)
         val clientCert = X509Utilities.createSelfSignedCACertificate(ALICE_NAME.x500Principal, clientKeys)
         val clientKeyStoreRaw = X509KeyStore("password")
-        clientKeyStoreRaw.setPrivateKey("TLS_CERT", clientKeys.private, listOf(clientCert))
-        val clientKeyStore = CertificateStore.of(clientKeyStoreRaw, "password")
+        clientKeyStoreRaw.setPrivateKey("TLS_CERT", clientKeys.private, listOf(clientCert), "password")
+        val clientKeyStore = CertificateStore.of(clientKeyStoreRaw, "password", "password")
 
         val clientTrustStoreRaw = X509KeyStore("password")
         clientTrustStoreRaw.setCertificate("TLS_ROOT", clientCert)
-        val clientTrustStore = CertificateStore.of(clientTrustStoreRaw, "password")
+        val clientTrustStore = CertificateStore.of(clientTrustStoreRaw, "password", "password")
         val amqpConfig = object : AMQPConfiguration {
             override val keyStore = clientKeyStore
             override val trustStore = clientTrustStore
diff --git a/bridge/src/test/kotlin/net/corda/bridge/BridgeTestHelper.kt b/bridge/src/test/kotlin/net/corda/bridge/BridgeTestHelper.kt
index a9a9bde0c0..c0a8430910 100644
--- a/bridge/src/test/kotlin/net/corda/bridge/BridgeTestHelper.kt
+++ b/bridge/src/test/kotlin/net/corda/bridge/BridgeTestHelper.kt
@@ -76,7 +76,8 @@ fun MutualSslConfiguration.createBridgeKeyStores(legalName: CordaX500Name,
         setPrivateKey(
                 X509Utilities.CORDA_CLIENT_TLS,
                 tlsKeyPair.private,
-                listOf(tlsCert, nodeCaCert, intermediateCa.certificate, rootCert))
+                listOf(tlsCert, nodeCaCert, intermediateCa.certificate, rootCert),
+                sslKeyStore.entryPassword)
     }
 }
 
diff --git a/bridge/src/test/kotlin/net/corda/bridge/ConfigTest.kt b/bridge/src/test/kotlin/net/corda/bridge/ConfigTest.kt
index f6a4b8d889..c4d7af67df 100644
--- a/bridge/src/test/kotlin/net/corda/bridge/ConfigTest.kt
+++ b/bridge/src/test/kotlin/net/corda/bridge/ConfigTest.kt
@@ -73,13 +73,13 @@ class ConfigTest {
         val config = createAndLoadConfigFromResource(tempFolder.root.toPath(), configResource)
         assertEquals(Paths.get("outboundcerts/outboundkeys.jks"), config.outboundConfig!!.customSSLConfiguration!!.keyStore.path)
         assertEquals(Paths.get("outboundcerts/outboundtrust.jks"), config.outboundConfig!!.customSSLConfiguration!!.trustStore.path)
-        assertEquals("outboundkeypassword", config.outboundConfig!!.customSSLConfiguration!!.keyStore.password)
-        assertEquals("outboundtrustpassword", config.outboundConfig!!.customSSLConfiguration!!.trustStore.password)
+        assertEquals("outboundkeypassword", config.outboundConfig!!.customSSLConfiguration!!.keyStore.storePassword)
+        assertEquals("outboundtrustpassword", config.outboundConfig!!.customSSLConfiguration!!.trustStore.storePassword)
         assertNull(config.inboundConfig)
         assertEquals(Paths.get("tunnelcerts/tunnelkeys.jks"), config.bridgeInnerConfig!!.customSSLConfiguration!!.keyStore.path)
         assertEquals(Paths.get("tunnelcerts/tunneltrust.jks"), config.bridgeInnerConfig!!.customSSLConfiguration!!.trustStore.path)
-        assertEquals("tunnelkeypassword", config.bridgeInnerConfig!!.customSSLConfiguration!!.keyStore.password)
-        assertEquals("tunneltrustpassword", config.bridgeInnerConfig!!.customSSLConfiguration!!.trustStore.password)
+        assertEquals("tunnelkeypassword", config.bridgeInnerConfig!!.customSSLConfiguration!!.keyStore.storePassword)
+        assertEquals("tunneltrustpassword", config.bridgeInnerConfig!!.customSSLConfiguration!!.trustStore.storePassword)
         assertNull(config.floatOuterConfig)
     }
 
@@ -89,13 +89,13 @@ class ConfigTest {
         val config = createAndLoadConfigFromResource(tempFolder.root.toPath(), configResource)
         assertEquals(Paths.get("inboundcerts/inboundkeys.jks"), config.inboundConfig!!.customSSLConfiguration!!.keyStore.path)
         assertEquals(Paths.get("inboundcerts/inboundtrust.jks"), config.inboundConfig!!.customSSLConfiguration!!.trustStore.path)
-        assertEquals("inboundkeypassword", config.inboundConfig!!.customSSLConfiguration!!.keyStore.password)
-        assertEquals("inboundtrustpassword", config.inboundConfig!!.customSSLConfiguration!!.trustStore.password)
+        assertEquals("inboundkeypassword", config.inboundConfig!!.customSSLConfiguration!!.keyStore.storePassword)
+        assertEquals("inboundtrustpassword", config.inboundConfig!!.customSSLConfiguration!!.trustStore.storePassword)
         assertNull(config.outboundConfig)
         assertEquals(Paths.get("tunnelcerts/tunnelkeys.jks"), config.floatOuterConfig!!.customSSLConfiguration!!.keyStore.path)
         assertEquals(Paths.get("tunnelcerts/tunneltrust.jks"), config.floatOuterConfig!!.customSSLConfiguration!!.trustStore.path)
-        assertEquals("tunnelkeypassword", config.floatOuterConfig!!.customSSLConfiguration!!.keyStore.password)
-        assertEquals("tunneltrustpassword", config.floatOuterConfig!!.customSSLConfiguration!!.trustStore.password)
+        assertEquals("tunnelkeypassword", config.floatOuterConfig!!.customSSLConfiguration!!.keyStore.storePassword)
+        assertEquals("tunneltrustpassword", config.floatOuterConfig!!.customSSLConfiguration!!.trustStore.storePassword)
         assertNull(config.bridgeInnerConfig)
     }