diff --git a/test/unit/org/apache/cassandra/utils/memory/MemtableCleanerThreadTest.java b/test/unit/org/apache/cassandra/utils/memory/MemtableCleanerThreadTest.java
index e8c6d71411..c6d01dec98 100644
--- a/test/unit/org/apache/cassandra/utils/memory/MemtableCleanerThreadTest.java
+++ b/test/unit/org/apache/cassandra/utils/memory/MemtableCleanerThreadTest.java
@@ -35,6 +35,7 @@ import org.apache.cassandra.utils.concurrent.AsyncPromise;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNull;
 import static org.mockito.Mockito.when;
 
 public class MemtableCleanerThreadTest
@@ -111,6 +112,22 @@ public class MemtableCleanerThreadTest
         stopThread();
     }
 
+    @Test
+    public void testCleanerError() throws Exception
+    {
+        when(pool.needsCleaning()).thenReturn(false);
+        AsyncPromise<Boolean > fut = new AsyncPromise<>();
+        cleaner = () -> {
+            return fut;
+        };
+
+        Clean<> clean = new Clean<>(pool, cleaner);
+
+        Boolean res = clean.apply(null, null);
+
+        assertNull(res);
+    }
+
     @Test
     public void testCleanerError() throws Exception
     {