diff --git a/server/src/test/java/org/elasticsearch/common/util/concurrent/CountDownTests.java b/server/src/test/java/org/elasticsearch/common/util/concurrent/CountDownTests.java
index 1a32064fe7daa..46021344fb73a 100644
--- a/server/src/test/java/org/elasticsearch/common/util/concurrent/CountDownTests.java
+++ b/server/src/test/java/org/elasticsearch/common/util/concurrent/CountDownTests.java
@@ -34,12 +34,13 @@ public void testConcurrent() throws InterruptedException {
         final AtomicInteger count = new AtomicInteger(0);
         final CountDown countDown = new CountDown(scaledRandomIntBetween(10, 1000));
         Thread[] threads = new Thread[between(3, 10)];
-        final CountDownLatch latch = new CountDownLatch(1);
+        final CountDownLatch latch = new CountDownLatch(1 + threads.length);
         for (int i = 0; i < threads.length; i++) {
             threads[i] = new Thread() {
 
                 @Override
                 public void run() {
+                    latch.countDown();
                     try {
                         latch.await();
                     } catch (InterruptedException e) {
diff --git a/server/src/test/java/org/elasticsearch/common/util/concurrent/KeyedLockTests.java b/server/src/test/java/org/elasticsearch/common/util/concurrent/KeyedLockTests.java
index e50e205ff1386..2160052619c11 100644
--- a/server/src/test/java/org/elasticsearch/common/util/concurrent/KeyedLockTests.java
+++ b/server/src/test/java/org/elasticsearch/common/util/concurrent/KeyedLockTests.java
@@ -45,8 +45,8 @@ public void testIfMapEmptyAfterLotsOfAcquireAndReleases() throws InterruptedExce
         for (int i = 0; i < names.length; i++) {
             names[i] = randomRealisticUnicodeOfLengthBetween(10, 20);
         }
-        CountDownLatch startLatch = new CountDownLatch(1);
         int numThreads = randomIntBetween(3, 10);
+        final CountDownLatch startLatch = new CountDownLatch(1 + numThreads);
         AcquireAndReleaseThread[] threads = new AcquireAndReleaseThread[numThreads];
         for (int i = 0; i < numThreads; i++) {
             threads[i] = new AcquireAndReleaseThread(startLatch, connectionLock, names, counter, safeCounter);
@@ -157,6 +157,7 @@ public AcquireAndReleaseThread(CountDownLatch startLatch, KeyedLock<String> conn
 
         @Override
         public void run() {
+            startLatch.countDown();
             try {
                 startLatch.await();
             } catch (InterruptedException e) {
diff --git a/server/src/test/java/org/elasticsearch/common/util/concurrent/RunOnceTests.java b/server/src/test/java/org/elasticsearch/common/util/concurrent/RunOnceTests.java
index e833edc9d56b3..a41d37be2150a 100644
--- a/server/src/test/java/org/elasticsearch/common/util/concurrent/RunOnceTests.java
+++ b/server/src/test/java/org/elasticsearch/common/util/concurrent/RunOnceTests.java
@@ -45,9 +45,10 @@ public void testRunOnceConcurrently() throws InterruptedException {
         final RunOnce runOnce = new RunOnce(counter::incrementAndGet);
 
         final Thread[] threads = new Thread[between(3, 10)];
-        final CountDownLatch latch = new CountDownLatch(1);
+        final CountDownLatch latch = new CountDownLatch(1 + threads.length);
         for (int i = 0; i < threads.length; i++) {
             threads[i] = new Thread(() -> {
+                latch.countDown();
                 try {
                     latch.await();
                 } catch (InterruptedException e) {
diff --git a/server/src/test/java/org/elasticsearch/node/ResponseCollectorServiceTests.java b/server/src/test/java/org/elasticsearch/node/ResponseCollectorServiceTests.java
index 5fedfa7869e8b..7ac254f9948f8 100644
--- a/server/src/test/java/org/elasticsearch/node/ResponseCollectorServiceTests.java
+++ b/server/src/test/java/org/elasticsearch/node/ResponseCollectorServiceTests.java
@@ -77,9 +77,10 @@ public void testNodeStats() throws Exception {
     public void testConcurrentAddingAndRemoving() throws Exception {
         String[] nodes = new String[] {"a", "b", "c", "d"};
 
-        final CountDownLatch latch = new CountDownLatch(1);
+        final CountDownLatch latch = new CountDownLatch(5);
 
         Runnable f = () -> {
+            latch.countDown();
             try {
                 latch.await();
             } catch (InterruptedException e) {