diff --git a/solr/core/src/java/org/apache/solr/search/facet/UnInvertedField.java b/solr/core/src/java/org/apache/solr/search/facet/UnInvertedField.java
index 6b4ac8b201e..df979d756dc 100644
--- a/solr/core/src/java/org/apache/solr/search/facet/UnInvertedField.java
+++ b/solr/core/src/java/org/apache/solr/search/facet/UnInvertedField.java
@@ -564,6 +564,8 @@ public class UnInvertedField extends DocTermOrds {
   // called from FieldFacetProcessor
   // TODO: do a callback version that can be specialized!
   public void collectDocs(FacetFieldProcessorUIF processor) throws IOException {
+    if (processor.accs.length==1 && processor.accs[0] instanceof CountSlotAcc)
+
     use.incrementAndGet();
 
     DocSet docs = processor.fcontext.base;
diff --git a/solr/core/src/test/org/apache/solr/request/TestMacros.java b/solr/core/src/test/org/apache/solr/request/macro/TestMacros.java
similarity index 100%
rename from solr/core/src/test/org/apache/solr/request/TestMacros.java
rename to solr/core/src/test/org/apache/solr/request/macro/TestMacros.java