diff --git a/gradle/javaprojects.gradle b/gradle/javaprojects.gradle
index 87c69ea3b9..1a3c4ac97c 100644
--- a/gradle/javaprojects.gradle
+++ b/gradle/javaprojects.gradle
@@ -128,7 +128,7 @@ project.conf2ScopeMappings.addMapping(MavenPlugin.TEST_COMPILE_PRIORITY + 2, pro
 check.dependsOn integrationTest
 
 task springSnapshotTest(type: Test) {
-	jvmArgs = ['-ea', '-Xmx500m']
+	jvmArgs = ['-ea', '-Xmx500m', '-XX:MaxPermSize=128M']
 	classpath = sourceSets.test.output + sourceSets.main.output + configurations.springSnapshotTestRuntime
 	reports {
 		html.destination = project.file("$buildDir/spring-snapshot-test-results/")
diff --git a/gradlew b/gradlew
index 4c74b4b4c2..8b45b7773e 100755
--- a/gradlew
+++ b/gradlew
@@ -7,7 +7,7 @@
 ##############################################################################
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS="-Xmx1024M"
+DEFAULT_JVM_OPTS="-Xmx1024M -XX:MaxPermSize=512M"
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`