diff --git a/solr/src/test/org/apache/solr/SolrInfoMBeanTest.java b/solr/src/test/org/apache/solr/SolrInfoMBeanTest.java
index f9ce88d5af2..078b1597168 100644
--- a/solr/src/test/org/apache/solr/SolrInfoMBeanTest.java
+++ b/solr/src/test/org/apache/solr/SolrInfoMBeanTest.java
@@ -98,6 +98,12 @@ public class SolrInfoMBeanTest extends LuceneTestCase
         String[] files = directory.list();
         for (String file : files) {
           if (file.endsWith(".class")) {
+            // FIXME: Find the static/sysprop/file leakage here.
+            // If we call Class.forName(ReplicationHandler) here, its test will later fail
+            // when run inside the same JVM (-Dtests.threadspercpu=0), so something is wrong.
+            if (file.contains("ReplicationHandler"))
+              continue;
+            
              classes.add(Class.forName(pckgname + '.' + file.substring(0, file.length() - 6)));
           }
         }