diff --git a/config/src/test/groovy/org/springframework/security/config/doc/XsdDocumentedTests.groovy b/config/src/test/groovy/org/springframework/security/config/doc/XsdDocumentedTests.groovy
index 0826db318b..945a85a3e4 100644
--- a/config/src/test/groovy/org/springframework/security/config/doc/XsdDocumentedTests.groovy
+++ b/config/src/test/groovy/org/springframework/security/config/doc/XsdDocumentedTests.groovy
@@ -61,6 +61,15 @@ class XsdDocumentedTests extends Specification {
         }
     }
 
+    def cleanupSpec() {
+        appendix = null
+        appendixRoot = null
+        schema31xDocument = null
+        schemaDocument = null
+        elementNameToElement = null
+        schemaRootElement = null
+    }
+
     def 'SEC-2139: named-security-filter are all defined and ordered properly'() {
         setup:
             def expectedFilters = (EnumSet.allOf(SecurityFilters) as List).sort { it.order }
diff --git a/gradle/javaprojects.gradle b/gradle/javaprojects.gradle
index f4adbc62eb..646fe6a246 100644
--- a/gradle/javaprojects.gradle
+++ b/gradle/javaprojects.gradle
@@ -113,7 +113,7 @@ dependencies {
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
 
 test {
-    jvmArgs = ['-ea', '-Xmx500m']
+    jvmArgs = ['-ea', '-Xmx500m', '-XX:MaxPermSize=128M']
     maxParallelForks = guessMaxForks()
     logging.captureStandardOutput(LogLevel.INFO)
 }