diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
index 18e730a663f..86ab8682ae6 100755
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
@@ -110,8 +110,12 @@ public abstract class SolrTestCaseJ4 extends LuceneTestCase {
   static long numOpens;
   static long numCloses;
   public static void startTrackingSearchers() {
-    numOpens = SolrIndexSearcher.numOpens.get();
-    numCloses = SolrIndexSearcher.numCloses.get();
+    numOpens = SolrIndexSearcher.numOpens.getAndSet(0);
+    numCloses = SolrIndexSearcher.numCloses.getAndSet(0);
+    if (numOpens != 0 || numCloses != 0) {
+      log.error("startTrackingSearchers: numOpens="+numOpens+"numCloses="+numCloses);
+      numOpens = numCloses = 0;
+    }
   }
   static long zkClientNumOpens;
   static long zkClientNumCloses;