diff --git a/lucene/common-build.xml b/lucene/common-build.xml
index 5f0ca5230af..4196eea3652 100644
--- a/lucene/common-build.xml
+++ b/lucene/common-build.xml
@@ -145,8 +145,6 @@
     <isset property="run.clover"/>
   </condition>
 
-  <property name="tests.heapdump.args" value=""/>
-
   <!-- Override these in your local properties to your desire. -->
   <!-- Show simple class names (no package) in test suites. -->
   <property name="tests.useSimpleNames" value="false" />
@@ -908,6 +906,8 @@
         <property name="tests.dups"  value="1" />
         <property name="tests.useSecurityManager"  value="true" />
 
+        <property name="tests.heapdump.args" value=""/>
+
         <!-- turn on security manager? -->
         <condition property="java.security.manager" value="org.apache.lucene.util.TestSecurityManager">
           <istrue value="${tests.useSecurityManager}"/>
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 4c705dd6703..b13c971cced 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -379,6 +379,8 @@ Other Changes
 * SOLR-6625: Enable registering interceptors for the calls made using HttpClient and make the
   request object available at the interceptor context ( Ishan Chattopadhyay, Gregory Chanan, noble, Anshum Gupta)
 
+* SOLR-5022: On Java 7 raise permgen for running tests.  (Uwe Schindler)
+  
 ==================  5.2.1 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release
diff --git a/solr/common-build.xml b/solr/common-build.xml
index de136c3fe75..e3f09137b80 100644
--- a/solr/common-build.xml
+++ b/solr/common-build.xml
@@ -150,15 +150,11 @@
   </macrodef>
 
   <!-- 
-    - We don't test HDFS on Java 7 because it causes permgen errors. Java 8 no longer has permgen.
-    - We don't want to run HDFS tests on Windows, because they require Cygwin.
+    We don't want to run HDFS tests on Windows, because they require Cygwin.
     If you have Cygwin or manually raised permgen, you can override this property on command line:
   -->
   <condition property="tests.disableHdfs" value="true">
-    <or>
-      <equals arg1="${build.java.runtime}" arg2="1.7"/>
-      <os family="windows"/>
-    </or>
+    <os family="windows"/>
   </condition>
 
   <target name="validate" depends="compile-tools">