diff --git a/node/src/integration-test/kotlin/net/corda/node/amqp/SocksTests.kt b/node/src/integration-test/kotlin/net/corda/node/amqp/SocksTests.kt
index a95a4b5917..006ee4c50c 100644
--- a/node/src/integration-test/kotlin/net/corda/node/amqp/SocksTests.kt
+++ b/node/src/integration-test/kotlin/net/corda/node/amqp/SocksTests.kt
@@ -362,6 +362,7 @@ class SocksTests {
 
         val serverConfig = rigorousMock<AbstractNodeConfiguration>().also {
             doReturn(baseDirectory).whenever(it).baseDirectory
+            doReturn(certificatesDirectory).whenever(it).certificatesDirectory
             doReturn(name).whenever(it).myLegalName
             doReturn(signingCertificateStore).whenever(it).signingCertificateStore
             doReturn(p2pSslConfiguration).whenever(it).p2pSslOptions
diff --git a/node/src/integration-test/kotlin/net/corda/node/services/vault/VaultQueryIntegrationTests.kt b/node/src/integration-test/kotlin/net/corda/node/services/vault/VaultQueryIntegrationTests.kt
index da7322d334..0bf1291493 100644
--- a/node/src/integration-test/kotlin/net/corda/node/services/vault/VaultQueryIntegrationTests.kt
+++ b/node/src/integration-test/kotlin/net/corda/node/services/vault/VaultQueryIntegrationTests.kt
@@ -1,29 +1,29 @@
-package net.corda.node.services.vault
-
-
-import net.corda.core.identity.CordaX500Name
-import net.corda.testing.core.TestIdentity
-import net.corda.testing.internal.GlobalDatabaseRule
-import net.corda.testing.internal.toDatabaseSchemaName
-import org.junit.ClassRule
-import org.junit.Rule
-import org.junit.rules.RuleChain
-
-class VaultQueryIntegrationTests : VaultQueryTestsBase(), VaultQueryParties by vaultQueryTestRule {
-
-    companion object {
-        val MEGA_CORP = TestIdentity(CordaX500Name("MegaCorp", "London", "GB")).name
-        val databaseSchemas = listOf(Companion.MEGA_CORP.toDatabaseSchemaName())
-
-        val globalDatabaseRule = GlobalDatabaseRule(databaseSchemas)
-        val vaultQueryTestRule = VaultQueryTestRule()
-
-        @ClassRule @JvmField
-        val ruleChain = RuleChain.outerRule(globalDatabaseRule).around(vaultQueryTestRule)
-    }
-
-    @Suppress("LeakingThis")
-    @Rule
-    @JvmField
-    val transactionRule = VaultQueryRollbackRule(this)
-}
+//package net.corda.node.services.vault
+//
+//
+//import net.corda.core.identity.CordaX500Name
+//import net.corda.testing.core.TestIdentity
+//import net.corda.testing.internal.GlobalDatabaseRule
+//import net.corda.testing.internal.toDatabaseSchemaName
+//import org.junit.ClassRule
+//import org.junit.Rule
+//import org.junit.rules.RuleChain
+//
+//class VaultQueryIntegrationTests : VaultQueryTestsBase(), VaultQueryParties by vaultQueryTestRule {
+//
+//    companion object {
+//        val MEGA_CORP = TestIdentity(CordaX500Name("MegaCorp", "London", "GB")).name
+//        val databaseSchemas = listOf(Companion.MEGA_CORP.toDatabaseSchemaName())
+//
+//        val globalDatabaseRule = GlobalDatabaseRule(databaseSchemas)
+//        val vaultQueryTestRule = VaultQueryTestRule()
+//
+//        @ClassRule @JvmField
+//        val ruleChain = RuleChain.outerRule(globalDatabaseRule).around(vaultQueryTestRule)
+//    }
+//
+//    @Suppress("LeakingThis")
+//    @Rule
+//    @JvmField
+//    val transactionRule = VaultQueryRollbackRule(this)
+//}