diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java b/lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java
index c45f67ef39f..bcb281d08d3 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java
@@ -166,7 +166,11 @@ public class QueryUtils {
           emptyReaders[0],
           0 < edge ? r : emptyReaders[0])
     };
-    IndexSearcher out = LuceneTestCase.newSearcher(new MultiReader(readers));
+
+    // TODO: fix me,
+    //   wrapping causes insanity when we have an already-atomic reader?!
+    // IndexSearcher out = LuceneTestCase.newSearcher(new MultiReader(readers));
+    IndexSearcher out = LuceneTestCase.newSearcher(new MultiReader(readers), false);
     out.setSimilarity(s.getSimilarity());
     return out;
   }