diff --git a/core-tests/build.gradle b/core-tests/build.gradle
index 52cf606abe..08d65e0eeb 100644
--- a/core-tests/build.gradle
+++ b/core-tests/build.gradle
@@ -14,6 +14,8 @@ configurations {
     smokeTestRuntimeOnly.extendsFrom runtimeOnly
 }
 
+evaluationDependsOn(':node:capsule')
+
 sourceSets {
     integrationTest {
         kotlin {
diff --git a/core/build.gradle b/core/build.gradle
index f4cf4a642e..796acf07b0 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -7,8 +7,6 @@ apply plugin: 'com.jfrog.artifactory'
 
 description 'Corda core'
 
-evaluationDependsOn(':node:capsule')
-
 configurations {
     integrationTestCompile.extendsFrom testCompile
     integrationTestRuntimeOnly.extendsFrom testRuntimeOnly
diff --git a/node/build.gradle b/node/build.gradle
index 0865791032..5671ec3e7f 100644
--- a/node/build.gradle
+++ b/node/build.gradle
@@ -209,7 +209,7 @@ tasks.withType(JavaCompile) {
 }
 
 test {
-    maxHeapSize = "2g"
+    maxHeapSize = "3g"
     maxParallelForks = (System.env.CORDA_NODE_TESTING_FORKS == null) ? 1 : "$System.env.CORDA_NODE_TESTING_FORKS".toInteger()
 }