diff --git a/src/main/java/org/redisson/Redisson.java b/src/main/java/org/redisson/Redisson.java
index a6c88ea08..cfd3de6d5 100755
--- a/src/main/java/org/redisson/Redisson.java
+++ b/src/main/java/org/redisson/Redisson.java
@@ -537,16 +537,6 @@ public class Redisson implements RedissonClient {
         return new RedisNodes<ClusterNode>(connectionManager);
     }
 
-    @Override
-    public void flushdb() {
-        commandExecutor.get(commandExecutor.writeAllAsync(RedisCommands.FLUSHDB));
-    }
-
-    @Override
-    public void flushall() {
-        commandExecutor.get(commandExecutor.writeAllAsync(RedisCommands.FLUSHALL));
-    }
-
     @Override
     public boolean isShutdown() {
         return connectionManager.isShutdown();
diff --git a/src/main/java/org/redisson/RedissonClient.java b/src/main/java/org/redisson/RedissonClient.java
index a83750c7d..72c2c31bb 100755
--- a/src/main/java/org/redisson/RedissonClient.java
+++ b/src/main/java/org/redisson/RedissonClient.java
@@ -658,18 +658,6 @@ public interface RedissonClient {
      */
     NodesGroup<ClusterNode> getClusterNodesGroup();
 
-    /**
-     * Use {@link RKeys#flushdb()}
-     */
-    @Deprecated
-    void flushdb();
-
-    /**
-     * Use {@link RKeys#flushall()}
-     */
-    @Deprecated
-    void flushall();
-
     /**
      * Returns {@code true} if this Redisson instance has been shut down.
      *
diff --git a/src/test/java/org/redisson/RedissonBucketTest.java b/src/test/java/org/redisson/RedissonBucketTest.java
index 7ed1bba45..ff88c0173 100755
--- a/src/test/java/org/redisson/RedissonBucketTest.java
+++ b/src/test/java/org/redisson/RedissonBucketTest.java
@@ -59,7 +59,7 @@ public class RedissonBucketTest extends BaseTest {
         assertThat(r1.trySet("4", 500, TimeUnit.MILLISECONDS)).isFalse();
         assertThat(r1.get()).isEqualTo("3");
 
-        Thread.sleep(500);
+        Thread.sleep(1000);
 
         assertThat(r1.get()).isNull();
     }
diff --git a/src/test/java/org/redisson/RedissonConcurrentMapTest.java b/src/test/java/org/redisson/RedissonConcurrentMapTest.java
index ed3903744..adaa1f142 100644
--- a/src/test/java/org/redisson/RedissonConcurrentMapTest.java
+++ b/src/test/java/org/redisson/RedissonConcurrentMapTest.java
@@ -94,7 +94,7 @@ public class RedissonConcurrentMapTest extends BaseConcurrentTest {
         }
         assertMapSize(5, name);
 
-        redisson.flushdb();
+        redisson.getKeys().flushdb();
         redisson.shutdown();
     }
 
diff --git a/src/test/java/org/redisson/RedissonKeysTest.java b/src/test/java/org/redisson/RedissonKeysTest.java
index 4380d26df..ef6a4d4b9 100644
--- a/src/test/java/org/redisson/RedissonKeysTest.java
+++ b/src/test/java/org/redisson/RedissonKeysTest.java
@@ -58,7 +58,7 @@ public class RedissonKeysTest extends BaseTest {
         assertThat(redisson.getKeys().randomKey()).isIn("test1", "test2");
         redisson.getKeys().delete("test1");
         Assert.assertEquals(redisson.getKeys().randomKey(), "test2");
-        redisson.flushdb();
+        redisson.getKeys().flushdb();
         Assert.assertNull(redisson.getKeys().randomKey());
     }
 
diff --git a/src/test/java/org/redisson/RedissonSetMultimapCacheTest.java b/src/test/java/org/redisson/RedissonSetMultimapCacheTest.java
index 442855b8c..a4da5c6dd 100644
--- a/src/test/java/org/redisson/RedissonSetMultimapCacheTest.java
+++ b/src/test/java/org/redisson/RedissonSetMultimapCacheTest.java
@@ -102,7 +102,7 @@ public class RedissonSetMultimapCacheTest extends BaseTest {
         multimap.put("1", "3");
         multimap.expireKey("1", 1, TimeUnit.SECONDS);
         
-        Thread.sleep(1000);
+        Thread.sleep(1500);
         
         assertThat(multimap.get("1").size()).isZero();
         assertThat(multimap.get("1")).contains();