diff --git a/gradle.properties b/gradle.properties
index 27af3d1328..a502af5921 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,2 @@
 # Keep system properties in sync with test system properties (java-module.gradle)!
-org.gradle.jvmargs=-Xmx1g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Duser.language=en -Duser.country=US -Duser.timezone=UTC -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=256m -XX:+HeapDumpOnOutOfMemoryError -Duser.language=en -Duser.country=US -Duser.timezone=UTC -Dfile.encoding=UTF-8
diff --git a/gradle/java-module.gradle b/gradle/java-module.gradle
index dfa9cadb78..0e0531217d 100644
--- a/gradle/java-module.gradle
+++ b/gradle/java-module.gradle
@@ -176,10 +176,10 @@ tasks.withType( Test.class ).all { task ->
 	task.jvmArgs += [
 			'-XX:+HeapDumpOnOutOfMemoryError',
 			"-XX:HeapDumpPath=${file( "${buildDir}/OOM-dump.hprof" ).absolutePath}",
-			'-XX:MetaspaceSize=512M'
+			'-XX:MetaspaceSize=256M'
 	]
 
-	task.maxHeapSize = '4G'
+	task.maxHeapSize = '3G'
 
 	task.systemProperties['hibernate.test.validatefailureexpected'] = true
 	task.systemProperties += System.properties.findAll { it.key.startsWith( "hibernate." ) }