diff --git a/src/test/java/org/redisson/BaseConcurrentTest.java b/src/test/java/org/redisson/BaseConcurrentTest.java
index af2140ca8..1d413363c 100644
--- a/src/test/java/org/redisson/BaseConcurrentTest.java
+++ b/src/test/java/org/redisson/BaseConcurrentTest.java
@@ -6,6 +6,8 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
+import org.junit.Assert;
+
 public abstract class BaseConcurrentTest extends BaseTest {
 
     protected void testMultiInstanceConcurrency(int iterations, final RedissonRunnable runnable) throws InterruptedException {
@@ -29,7 +31,7 @@ public abstract class BaseConcurrentTest extends BaseTest {
         }
 
         executor.shutdown();
-        executor.awaitTermination(5, TimeUnit.MINUTES);
+        Assert.assertTrue(executor.awaitTermination(5, TimeUnit.MINUTES));
 
         System.out.println("multi: " + (System.currentTimeMillis() - watch));
 
@@ -45,7 +47,7 @@ public abstract class BaseConcurrentTest extends BaseTest {
         }
 
         executor.shutdown();
-        executor.awaitTermination(5, TimeUnit.MINUTES);
+        Assert.assertTrue(executor.awaitTermination(5, TimeUnit.MINUTES));
     }
 
     protected void testSingleInstanceConcurrency(int iterations, final RedissonRunnable runnable) throws InterruptedException {
@@ -63,7 +65,7 @@ public abstract class BaseConcurrentTest extends BaseTest {
         }
 
         executor.shutdown();
-        executor.awaitTermination(5, TimeUnit.MINUTES);
+        Assert.assertTrue(executor.awaitTermination(5, TimeUnit.MINUTES));
 
         System.out.println(System.currentTimeMillis() - watch);
 
diff --git a/src/test/java/org/redisson/RedisClientTest.java b/src/test/java/org/redisson/RedisClientTest.java
index 62d62d799..702ee84c1 100644
--- a/src/test/java/org/redisson/RedisClientTest.java
+++ b/src/test/java/org/redisson/RedisClientTest.java
@@ -90,7 +90,7 @@ public class RedisClientTest {
         }
 
         pool.shutdown();
-        pool.awaitTermination(1, TimeUnit.HOURS);
+        Assert.assertTrue(pool.awaitTermination(1, TimeUnit.HOURS));
 
         Assert.assertEquals(100000L, conn.sync(LongCodec.INSTANCE, RedisCommands.GET, "test"));
 
diff --git a/src/test/java/org/redisson/RedissonCountDownLatchConcurrentTest.java b/src/test/java/org/redisson/RedissonCountDownLatchConcurrentTest.java
index f319f7f24..417a57bc3 100644
--- a/src/test/java/org/redisson/RedissonCountDownLatchConcurrentTest.java
+++ b/src/test/java/org/redisson/RedissonCountDownLatchConcurrentTest.java
@@ -48,7 +48,7 @@ public class RedissonCountDownLatchConcurrentTest {
         }
 
         executor.shutdown();
-        executor.awaitTermination(10, TimeUnit.SECONDS);
+        Assert.assertTrue(executor.awaitTermination(10, TimeUnit.SECONDS));
 
         redisson.shutdown();
     }
diff --git a/src/test/java/org/redisson/RedissonCountDownLatchTest.java b/src/test/java/org/redisson/RedissonCountDownLatchTest.java
index a76e910c2..6e2e76789 100644
--- a/src/test/java/org/redisson/RedissonCountDownLatchTest.java
+++ b/src/test/java/org/redisson/RedissonCountDownLatchTest.java
@@ -44,7 +44,7 @@ public class RedissonCountDownLatchTest extends BaseTest {
         });
 
         executor.shutdown();
-        executor.awaitTermination(10, TimeUnit.SECONDS);
+        Assert.assertTrue(executor.awaitTermination(10, TimeUnit.SECONDS));
 
     }
 
@@ -82,7 +82,7 @@ public class RedissonCountDownLatchTest extends BaseTest {
         });
 
         executor.shutdown();
-        executor.awaitTermination(10, TimeUnit.SECONDS);
+        Assert.assertTrue(executor.awaitTermination(10, TimeUnit.SECONDS));
     }
 
     @Test
diff --git a/src/test/java/org/redisson/RedissonTopicTest.java b/src/test/java/org/redisson/RedissonTopicTest.java
index 4d51b7f8f..23158db91 100644
--- a/src/test/java/org/redisson/RedissonTopicTest.java
+++ b/src/test/java/org/redisson/RedissonTopicTest.java
@@ -1,16 +1,13 @@
 package org.redisson;
 
 import java.io.Serializable;
-import java.util.Iterator;
 import java.util.concurrent.CountDownLatch;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.redisson.client.protocol.pubsub.PubSubType;
 import org.redisson.core.BaseStatusListener;
 import org.redisson.core.MessageListener;
 import org.redisson.core.RTopic;
-import org.redisson.core.StatusListener;
 
 public class RedissonTopicTest {