diff --git a/src/test/java/org/redisson/BaseTest.java b/src/test/java/org/redisson/BaseTest.java
index 431f15e80..263122235 100644
--- a/src/test/java/org/redisson/BaseTest.java
+++ b/src/test/java/org/redisson/BaseTest.java
@@ -1,15 +1,21 @@
 package org.redisson;
 
 import java.util.Collection;
+import java.util.Map;
 
 import org.junit.Assert;
 
 public abstract class BaseTest {
 
+    protected void clear(Map<?, ?> map, Redisson redisson) {
+        map.clear();
+        Assert.assertEquals(0, map.size());
+        redisson.shutdown();
+    }
+
     protected void clear(Collection<?> collection, Redisson redisson) {
         collection.clear();
         Assert.assertEquals(0, collection.size());
-
         redisson.shutdown();
     }
 
diff --git a/src/test/java/org/redisson/RedissonListTest.java b/src/test/java/org/redisson/RedissonListTest.java
index f7913213f..ae1fad469 100644
--- a/src/test/java/org/redisson/RedissonListTest.java
+++ b/src/test/java/org/redisson/RedissonListTest.java
@@ -2,7 +2,6 @@ package org.redisson;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
diff --git a/src/test/java/org/redisson/RedissonMapTest.java b/src/test/java/org/redisson/RedissonMapTest.java
index 9ebe4e791..970f29198 100644
--- a/src/test/java/org/redisson/RedissonMapTest.java
+++ b/src/test/java/org/redisson/RedissonMapTest.java
@@ -6,7 +6,7 @@ import java.util.concurrent.ConcurrentMap;
 import org.junit.Assert;
 import org.junit.Test;
 
-public class RedissonMapTest {
+public class RedissonMapTest extends BaseTest {
 
     public static class SimpleKey {
 
@@ -323,12 +323,6 @@ public class RedissonMapTest {
         clear(map, redisson);
     }
 
-    private void clear(Map<?, ?> map, Redisson redisson) {
-        map.clear();
-        Assert.assertEquals(0, map.size());
-        redisson.shutdown();
-    }
-
     @Test
     public void testSize() {
         Redisson redisson = Redisson.create();
diff --git a/src/test/java/org/redisson/RedissonSetTest.java b/src/test/java/org/redisson/RedissonSetTest.java
index 0ace5072e..33c7250d5 100644
--- a/src/test/java/org/redisson/RedissonSetTest.java
+++ b/src/test/java/org/redisson/RedissonSetTest.java
@@ -1,7 +1,6 @@
 package org.redisson;
 
 import java.util.Arrays;
-import java.util.List;
 import java.util.Set;
 
 import org.hamcrest.MatcherAssert;
diff --git a/src/test/java/org/redisson/RedissonTopicTest.java b/src/test/java/org/redisson/RedissonTopicTest.java
index 7079a2942..42e93d28a 100644
--- a/src/test/java/org/redisson/RedissonTopicTest.java
+++ b/src/test/java/org/redisson/RedissonTopicTest.java
@@ -1,7 +1,6 @@
 package org.redisson;
 
 import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.atomic.AtomicReference;
 
 import org.junit.Assert;
 import org.junit.Test;