diff --git a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
index 75f1d360518..91f985f8a2f 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
@@ -110,7 +110,9 @@ public class ChaosMonkeyNothingIsSafeTest extends AbstractFullDistribZkTestBase
 
     int numShards = Integer.parseInt(System.getProperty("solr.tests.cloud.cm.shardcount", "-1"));
     if (numShards == -1) {
-      numShards = sliceCount + random().nextInt(TEST_NIGHTLY ? 12 : 2);
+      // we make sure that there's at least one shard with more than one replica
+      // so that the ChaosMonkey has something to kill
+      numShards = sliceCount + random().nextInt(TEST_NIGHTLY ? 12 : 2) + 1;
     }
     fixShardCount(numShards);
   }
@@ -358,8 +360,8 @@ public class ChaosMonkeyNothingIsSafeTest extends AbstractFullDistribZkTestBase
         }
         
       }
-      
-      System.err.println("FT added docs:" + numAdds + " with " + fails + " fails" + " deletes:" + numDeletes);
+
+      log.info("FT added docs:" + numAdds + " with " + fails + " fails" + " deletes:" + numDeletes);
     }
 
     private void changeUrlOnError(Exception e) {
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
index 1174737bd3b..cc8bf520c4b 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
@@ -1428,7 +1428,7 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTes
         }
       }
 
-      System.err.println("num searches done:" + numSearches + " with " + queryFails + " fails");
+      log.info("num searches done:" + numSearches + " with " + queryFails + " fails");
     }
 
     @Override
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/StopableIndexingThread.java b/solr/test-framework/src/java/org/apache/solr/cloud/StopableIndexingThread.java
index 100798ea985..3f04d7050a0 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/StopableIndexingThread.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/StopableIndexingThread.java
@@ -29,8 +29,8 @@ import org.apache.solr.common.SolrInputDocument;
  */
 
 public class StopableIndexingThread extends AbstractFullDistribZkTestBase.StopableThread {
-  private static String t1 = "a_t";
-  private static String i1 = "a_i";
+  static String t1 = "a_t";
+  static String i1 = "a_i";
   private volatile boolean stop = false;
   protected final String id;
   protected final List<String> deletes = new ArrayList<>();