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 7695e6f2647..6ca7607f7bb 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
@@ -130,7 +130,7 @@ public class ChaosMonkeyNothingIsSafeTest extends AbstractFullDistribZkTestBase
        del("*:*");
       
       List<StopableThread> threads = new ArrayList<>();
-      int threadCount = 1;
+      int threadCount = TEST_NIGHTLY ? 3 : 1;
       int i = 0;
       for (i = 0; i < threadCount; i++) {
         StopableIndexingThread indexThread = new StopableIndexingThread(controlClient, cloudClient, Integer.toString(i), true);
@@ -167,7 +167,7 @@ public class ChaosMonkeyNothingIsSafeTest extends AbstractFullDistribZkTestBase
             runTimes = new int[] {5000, 6000, 10000, 15000, 25000, 30000,
                 30000, 45000, 90000, 120000};
           } else {
-            runTimes = new int[] {145000, 240000, 300000};
+            runTimes = new int[] {5000, 7000, 15000};
           }
           runLength = runTimes[random().nextInt(runTimes.length - 1)];
         }