diff --git a/build.gradle b/build.gradle
index 7f30d9cbfe..2c826f4454 100644
--- a/build.gradle
+++ b/build.gradle
@@ -303,7 +303,8 @@ configure(javaProjects) { subproject ->
 	}
 
 	test {
-		maxHeapSize = '1536m'
+		maxHeapSize = '2g'
+		jvmArgs '-XX:+HeapDumpOnOutOfMemoryError'
 		jacoco {
 			destinationFile = file("$buildDir/jacoco.exec")
 		}