diff --git a/src/test/java/redis/clients/jedis/PipeliningTest.java b/src/test/java/redis/clients/jedis/PipeliningTest.java
index 7df000c7a3..fede809686 100644
--- a/src/test/java/redis/clients/jedis/PipeliningTest.java
+++ b/src/test/java/redis/clients/jedis/PipeliningTest.java
@@ -20,12 +20,14 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
+import java.util.concurrent.TimeUnit;
 
 import org.hamcrest.Matcher;
 import org.hamcrest.Matchers;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
+import org.awaitility.Awaitility;
 
 import redis.clients.jedis.commands.ProtocolCommand;
 import redis.clients.jedis.commands.jedis.JedisCommandsTestBase;
@@ -342,7 +344,8 @@ public void waitAof() {
 
     try (Jedis j = new Jedis(endpoint.getHostAndPort())) {
       j.auth(endpoint.getPassword());
-      assertEquals("aof", j.get("wait"));
+      Awaitility.await().atMost(5, TimeUnit.SECONDS).pollInterval(50, TimeUnit.MILLISECONDS)
+          .untilAsserted(() -> assertEquals("aof", j.get("wait")));
     }
   }
 
diff --git a/src/test/java/redis/clients/jedis/csc/UnifiedJedisClientSideCacheTestBase.java b/src/test/java/redis/clients/jedis/csc/UnifiedJedisClientSideCacheTestBase.java
index 5346db3809..e07bf578ee 100644
--- a/src/test/java/redis/clients/jedis/csc/UnifiedJedisClientSideCacheTestBase.java
+++ b/src/test/java/redis/clients/jedis/csc/UnifiedJedisClientSideCacheTestBase.java
@@ -2,6 +2,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
 import static org.awaitility.Awaitility.await;
 
 import java.util.Arrays;
@@ -41,7 +42,7 @@ public void simple() {
       assertEquals("bar", jedis.get("foo"));
       control.del("foo");
       await().atMost(5, TimeUnit.SECONDS).pollInterval(50, TimeUnit.MILLISECONDS)
-          .until(() -> jedis.get("foo") == null);
+          .untilAsserted(() -> assertNull(jedis.get("foo")));
     }
   }
 
@@ -56,7 +57,7 @@ public void simpleWithSimpleMap() {
       control.del("foo");
       assertEquals(1, cache.getSize());
       await().atMost(5, TimeUnit.SECONDS).pollInterval(50, TimeUnit.MILLISECONDS)
-          .until(() -> jedis.get("foo") == null);
+          .untilAsserted(() -> assertNull(jedis.get("foo")));
       assertEquals(1, cache.getSize());
     }
   }
@@ -69,7 +70,7 @@ public void flushAll() {
       assertEquals("bar", jedis.get("foo"));
       control.flushAll();
       await().atMost(5, TimeUnit.SECONDS).pollInterval(50, TimeUnit.MILLISECONDS)
-          .until(() -> jedis.get("foo") == null);
+          .untilAsserted(() -> assertNull(jedis.get("foo")));
     }
   }
 
@@ -84,7 +85,7 @@ public void flushAllWithSimpleMap() {
       control.flushAll();
       assertEquals(1, cache.getSize());
       await().atMost(5, TimeUnit.SECONDS).pollInterval(50, TimeUnit.MILLISECONDS)
-          .until(() -> jedis.get("foo") == null);
+          .untilAsserted(() -> assertNull(jedis.get("foo")));
       assertEquals(1, cache.getSize());
     }
   }