diff --git a/buildOnTravis.sh b/buildOnTravis.sh
index 8bc7da67..afa339a2 100755
--- a/buildOnTravis.sh
+++ b/buildOnTravis.sh
@@ -75,7 +75,8 @@ fi
 
 export NATS_TEST_TRAVIS=yes
 echo "Using NATS server version: $NATS_TEST_SERVER_VERSION"
-ctest -L 'test' --timeout 60 --output-on-failure $4
+ctest -R 'Micro' --timeout 60 --output-on-failure $4 --repeat-until-fail 20
+# ctest -L 'test' --timeout 60 --output-on-failure $4
 res=$?
 if [ $res -ne 0 ]; then
   exit $res
diff --git a/test/test.c b/test/test.c
index 8abee506..ac684374 100644
--- a/test/test.c
+++ b/test/test.c
@@ -33584,7 +33584,7 @@ _startManyMicroservices(microService** svcs, int n, natsConnection *nc, microSer
 
 #define _waitForMicroservicesAllDone(_arg)                                              \
     {                                                                                   \
-        nats_Sleep(20);                                                                 \
+        nats_Sleep(50);                                                                 \
         natsMutex_Lock((_arg)->m);                                                      \
         testf("Wait for %d microservices to stop: ", (_arg)->microRunningServiceCount); \
         natsStatus waitStatus = NATS_OK;                                                \
@@ -34533,7 +34533,7 @@ void test_MicroServiceStopsWhenServerStops(void)
 
     _startMicroservice(&m, nc, &cfg, NULL, 0, &arg);
 
-    const int numEndpoints = 4;
+    const int numEndpoints = 50;
     for (int i=0; i < numEndpoints; i++)
     {
         char buf[32];