diff --git a/redisson/src/test/java/org/redisson/BaseReactiveTest.java b/redisson/src/test/java/org/redisson/BaseReactiveTest.java
index 1cba67283..e6c443dbe 100644
--- a/redisson/src/test/java/org/redisson/BaseReactiveTest.java
+++ b/redisson/src/test/java/org/redisson/BaseReactiveTest.java
@@ -2,15 +2,11 @@ package org.redisson;
 
 import java.io.IOException;
 import java.util.Iterator;
-import java.util.concurrent.TimeUnit;
 
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.rules.Timeout;
 import org.reactivestreams.Publisher;
 import org.redisson.api.RCollectionReactive;
 import org.redisson.api.RScoredSortedSetReactive;
@@ -22,11 +18,6 @@ import reactor.rx.Streams;
 
 public abstract class BaseReactiveTest {
 
-    @ClassRule
-    public static Timeout classTimeout = new Timeout(1, TimeUnit.HOURS);
-    @Rule
-    public Timeout testTimeout = new Timeout(15, TimeUnit.MINUTES);
-
     protected RedissonReactiveClient redisson;
     protected static RedissonReactiveClient defaultRedisson;
 
diff --git a/redisson/src/test/java/org/redisson/BaseTest.java b/redisson/src/test/java/org/redisson/BaseTest.java
index 00ba05e82..aab0677c1 100644
--- a/redisson/src/test/java/org/redisson/BaseTest.java
+++ b/redisson/src/test/java/org/redisson/BaseTest.java
@@ -1,25 +1,15 @@
 package org.redisson;
 
 import java.io.IOException;
-import java.util.concurrent.TimeUnit;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.rules.Timeout;
 import org.redisson.api.RedissonClient;
-import org.redisson.codec.MsgPackJacksonCodec;
 import org.redisson.config.Config;
 
 public abstract class BaseTest {
     
-    @ClassRule
-    public static Timeout classTimeout = new Timeout(1, TimeUnit.HOURS);
-    @Rule
-    public Timeout testTimeout = new Timeout(15, TimeUnit.MINUTES);
-
     protected RedissonClient redisson;
     protected static RedissonClient defaultRedisson;
 
diff --git a/redisson/src/test/java/org/redisson/RedisClientTest.java b/redisson/src/test/java/org/redisson/RedisClientTest.java
index 9128b83e9..93bf37600 100644
--- a/redisson/src/test/java/org/redisson/RedisClientTest.java
+++ b/redisson/src/test/java/org/redisson/RedisClientTest.java
@@ -33,18 +33,9 @@ import org.redisson.misc.RPromise;
 import org.redisson.misc.RedissonPromise;
 
 import io.netty.util.concurrent.FutureListener;
-import io.netty.util.concurrent.ImmediateEventExecutor;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.rules.Timeout;
 
 public class RedisClientTest {
 
-    @ClassRule
-    public static Timeout classTimeout = new Timeout(1, TimeUnit.HOURS);
-    @Rule
-    public Timeout testTimeout = new Timeout(15, TimeUnit.MINUTES);
-
     @BeforeClass
     public static void beforeClass() throws IOException, InterruptedException {
         if (!RedissonRuntimeEnvironment.isTravis) {
diff --git a/redisson/src/test/java/org/redisson/RedissonCountDownLatchConcurrentTest.java b/redisson/src/test/java/org/redisson/RedissonCountDownLatchConcurrentTest.java
index 9125006b7..5476862fc 100644
--- a/redisson/src/test/java/org/redisson/RedissonCountDownLatchConcurrentTest.java
+++ b/redisson/src/test/java/org/redisson/RedissonCountDownLatchConcurrentTest.java
@@ -11,20 +11,12 @@ import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.Timeout;
 import org.redisson.api.RCountDownLatch;
 import org.redisson.api.RedissonClient;
 
 public class RedissonCountDownLatchConcurrentTest {
     
-    @ClassRule
-    public static Timeout classTimeout = new Timeout(1, TimeUnit.HOURS);
-    @Rule
-    public Timeout testTimeout = new Timeout(15, TimeUnit.MINUTES);
-
     @BeforeClass
     public static void beforeClass() throws IOException, InterruptedException {
         if (!RedissonRuntimeEnvironment.isTravis) {
diff --git a/redisson/src/test/java/org/redisson/RedissonMultiLockTest.java b/redisson/src/test/java/org/redisson/RedissonMultiLockTest.java
index d4b6e72ae..8ea0b42af 100644
--- a/redisson/src/test/java/org/redisson/RedissonMultiLockTest.java
+++ b/redisson/src/test/java/org/redisson/RedissonMultiLockTest.java
@@ -14,17 +14,9 @@ import org.redisson.config.Config;
 
 import static com.jayway.awaitility.Awaitility.await;
 import static org.assertj.core.api.Assertions.assertThat;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.rules.Timeout;
 
 public class RedissonMultiLockTest {
 
-    @ClassRule
-    public static Timeout classTimeout = new Timeout(1, TimeUnit.HOURS);
-    @Rule
-    public Timeout testTimeout = new Timeout(15, TimeUnit.MINUTES);
-
     @Test
     public void testMultiThreads() throws IOException, InterruptedException {
         RedisProcess redis1 = redisTestMultilockInstance();
diff --git a/redisson/src/test/java/org/redisson/RedissonRedLockTest.java b/redisson/src/test/java/org/redisson/RedissonRedLockTest.java
index a36f04d3e..bb2d76e44 100644
--- a/redisson/src/test/java/org/redisson/RedissonRedLockTest.java
+++ b/redisson/src/test/java/org/redisson/RedissonRedLockTest.java
@@ -16,17 +16,9 @@ import org.redisson.config.Config;
 
 import static com.jayway.awaitility.Awaitility.await;
 import static org.assertj.core.api.Assertions.assertThat;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.rules.Timeout;
 
 public class RedissonRedLockTest {
 
-    @ClassRule
-    public static Timeout classTimeout = new Timeout(1, TimeUnit.HOURS);
-    @Rule
-    public Timeout testTimeout = new Timeout(15, TimeUnit.MINUTES);
-
     @Test
     public void testLockFailed() throws IOException, InterruptedException {
         RedisProcess redis1 = redisTestMultilockInstance();
diff --git a/redisson/src/test/java/org/redisson/RedissonTest.java b/redisson/src/test/java/org/redisson/RedissonTest.java
index d2b338dec..29c116219 100644
--- a/redisson/src/test/java/org/redisson/RedissonTest.java
+++ b/redisson/src/test/java/org/redisson/RedissonTest.java
@@ -24,7 +24,6 @@ import org.redisson.api.RedissonClient;
 import org.redisson.client.RedisConnectionException;
 import org.redisson.client.RedisException;
 import org.redisson.client.RedisOutOfMemoryException;
-import org.redisson.client.WriteRedisConnectionException;
 import org.redisson.client.protocol.decoder.ListScanResult;
 import org.redisson.codec.SerializationCodec;
 import org.redisson.config.Config;
@@ -32,18 +31,10 @@ import org.redisson.connection.ConnectionListener;
 
 import static com.jayway.awaitility.Awaitility.await;
 import static org.assertj.core.api.Assertions.assertThat;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.rules.Timeout;
 import static org.redisson.BaseTest.createInstance;
 
 public class RedissonTest {
 
-    @ClassRule
-    public static Timeout classTimeout = new Timeout(1, TimeUnit.HOURS);
-    @Rule
-    public Timeout testTimeout = new Timeout(15, TimeUnit.MINUTES);
-
     protected RedissonClient redisson;
     protected static RedissonClient defaultRedisson;
 
diff --git a/redisson/src/test/java/org/redisson/RedissonTopicPatternTest.java b/redisson/src/test/java/org/redisson/RedissonTopicPatternTest.java
index 140f57d6a..65533b905 100644
--- a/redisson/src/test/java/org/redisson/RedissonTopicPatternTest.java
+++ b/redisson/src/test/java/org/redisson/RedissonTopicPatternTest.java
@@ -19,28 +19,18 @@ import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.Timeout;
 import org.redisson.RedisRunner.RedisProcess;
 import org.redisson.api.RPatternTopic;
 import org.redisson.api.RTopic;
 import org.redisson.api.RedissonClient;
 import org.redisson.api.listener.BasePatternStatusListener;
-import org.redisson.api.listener.MessageListener;
 import org.redisson.api.listener.PatternMessageListener;
 import org.redisson.api.listener.PatternStatusListener;
-import org.redisson.api.listener.StatusListener;
 import org.redisson.config.Config;
 
 public class RedissonTopicPatternTest {
 
-    @ClassRule
-    public static Timeout classTimeout = new Timeout(1, TimeUnit.HOURS);
-    @Rule
-    public Timeout testTimeout = new Timeout(15, TimeUnit.MINUTES);
-
     @BeforeClass
     public static void beforeClass() throws IOException, InterruptedException {
         if (!RedissonRuntimeEnvironment.isTravis) {
diff --git a/redisson/src/test/java/org/redisson/RedissonTopicTest.java b/redisson/src/test/java/org/redisson/RedissonTopicTest.java
index 39b91fbf8..ca5848001 100644
--- a/redisson/src/test/java/org/redisson/RedissonTopicTest.java
+++ b/redisson/src/test/java/org/redisson/RedissonTopicTest.java
@@ -23,7 +23,6 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.redisson.RedisRunner.RedisProcess;
-import org.redisson.api.RBlockingQueue;
 import org.redisson.api.RSet;
 import org.redisson.api.RTopic;
 import org.redisson.api.RedissonClient;
@@ -36,17 +35,9 @@ import org.redisson.config.Config;
 
 import com.jayway.awaitility.Awaitility;
 import com.jayway.awaitility.Duration;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.rules.Timeout;
 
 public class RedissonTopicTest {
 
-    @ClassRule
-    public static Timeout classTimeout = new Timeout(1, TimeUnit.HOURS);
-    @Rule
-    public Timeout testTimeout = new Timeout(15, TimeUnit.MINUTES);
-
     @BeforeClass
     public static void beforeClass() throws IOException, InterruptedException {
         if (!RedissonRuntimeEnvironment.isTravis) {
diff --git a/redisson/src/test/java/org/redisson/RedissonTwoLockedThread.java b/redisson/src/test/java/org/redisson/RedissonTwoLockedThread.java
index 5f0d52e58..6ba710c1d 100644
--- a/redisson/src/test/java/org/redisson/RedissonTwoLockedThread.java
+++ b/redisson/src/test/java/org/redisson/RedissonTwoLockedThread.java
@@ -17,22 +17,13 @@ import org.redisson.config.Config;
 
 import java.util.Arrays;
 import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.rules.Timeout;
 import static org.redisson.BaseTest.createInstance;
 
 @RunWith(Parameterized.class)
 public class RedissonTwoLockedThread {
 
-    @ClassRule
-    public static Timeout classTimeout = new Timeout(1, TimeUnit.HOURS);
-    @Rule
-    public Timeout testTimeout = new Timeout(15, TimeUnit.MINUTES);
-
     @Parameterized.Parameters(name= "{index} - {0}")
     public static Iterable<Object[]> data() {
         return Arrays.asList(new Object[][] {{new JsonJacksonCodec()}, {new SerializationCodec()}});
diff --git a/redisson/src/test/java/org/redisson/client/codec/JsonJacksonMapValueCodecTest.java b/redisson/src/test/java/org/redisson/client/codec/JsonJacksonMapValueCodecTest.java
index 632c03d22..b0d4b4ebe 100644
--- a/redisson/src/test/java/org/redisson/client/codec/JsonJacksonMapValueCodecTest.java
+++ b/redisson/src/test/java/org/redisson/client/codec/JsonJacksonMapValueCodecTest.java
@@ -13,20 +13,11 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.TimeUnit;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.rules.Timeout;
 
 public class JsonJacksonMapValueCodecTest {
 
-    @ClassRule
-    public static Timeout classTimeout = new Timeout(1, TimeUnit.HOURS);
-    @Rule
-    public Timeout testTimeout = new Timeout(15, TimeUnit.MINUTES);
-
     private final JsonJacksonMapValueCodec<Map<String, List<String>>> mapCodec = new JsonJacksonMapValueCodec<Map<String, List<String>>>(new TypeReference<Map<String, List<String>>>() {
     });
 
diff --git a/redisson/src/test/java/org/redisson/connection/balancer/WeightedRoundRobinBalancerTest.java b/redisson/src/test/java/org/redisson/connection/balancer/WeightedRoundRobinBalancerTest.java
index 13bd2f886..940d30b47 100644
--- a/redisson/src/test/java/org/redisson/connection/balancer/WeightedRoundRobinBalancerTest.java
+++ b/redisson/src/test/java/org/redisson/connection/balancer/WeightedRoundRobinBalancerTest.java
@@ -1,17 +1,12 @@
 package org.redisson.connection.balancer;
 
-import static com.jayway.awaitility.Awaitility.await;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import org.junit.ClassRule;
-import org.junit.Rule;
 
 import org.junit.Test;
-import org.junit.rules.Timeout;
 import org.redisson.RedisRunner;
 import org.redisson.RedisRunner.RedisProcess;
 import org.redisson.Redisson;
@@ -21,11 +16,6 @@ import org.redisson.config.ReadMode;
 
 public class WeightedRoundRobinBalancerTest {
 
-    @ClassRule
-    public static Timeout classTimeout = new Timeout(1, TimeUnit.HOURS);
-    @Rule
-    public Timeout testTimeout = new Timeout(15, TimeUnit.MINUTES);
-
     @Test
     public void testUseMasterForReadsIfNoConnectionsToSlaves() throws IOException, InterruptedException {
         RedisProcess master = null;
diff --git a/redisson/src/test/java/org/redisson/misc/LFUCacheMapTest.java b/redisson/src/test/java/org/redisson/misc/LFUCacheMapTest.java
index 37ed5578d..f272cc366 100644
--- a/redisson/src/test/java/org/redisson/misc/LFUCacheMapTest.java
+++ b/redisson/src/test/java/org/redisson/misc/LFUCacheMapTest.java
@@ -3,19 +3,11 @@ package org.redisson.misc;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.concurrent.TimeUnit;
-import org.junit.ClassRule;
-import org.junit.Rule;
 
 import org.junit.Test;
-import org.junit.rules.Timeout;
 
 public class LFUCacheMapTest {
 
-    @ClassRule
-    public static Timeout classTimeout = new Timeout(1, TimeUnit.HOURS);
-    @Rule
-    public Timeout testTimeout = new Timeout(15, TimeUnit.MINUTES);
-
     @Test
     public void testMaxIdleTimeEviction() throws InterruptedException {
         Cache<Integer, Integer> map = new LFUCacheMap<Integer, Integer>(2, 0, 0);
diff --git a/redisson/src/test/java/org/redisson/misc/LRUCacheMapTest.java b/redisson/src/test/java/org/redisson/misc/LRUCacheMapTest.java
index b79d2ce07..530827416 100644
--- a/redisson/src/test/java/org/redisson/misc/LRUCacheMapTest.java
+++ b/redisson/src/test/java/org/redisson/misc/LRUCacheMapTest.java
@@ -3,19 +3,11 @@ package org.redisson.misc;
 import static org.assertj.core.api.Assertions.*;
 
 import java.util.concurrent.TimeUnit;
-import org.junit.ClassRule;
-import org.junit.Rule;
 
 import org.junit.Test;
-import org.junit.rules.Timeout;
 
 public class LRUCacheMapTest {
 
-    @ClassRule
-    public static Timeout classTimeout = new Timeout(1, TimeUnit.HOURS);
-    @Rule
-    public Timeout testTimeout = new Timeout(15, TimeUnit.MINUTES);
-
     @Test
     public void testMaxIdleTimeEviction() throws InterruptedException {
         Cache<Integer, Integer> map = new LRUCacheMap<Integer, Integer>(2, 0, 0);
diff --git a/redisson/src/test/java/org/redisson/misc/NoneCacheMapTest.java b/redisson/src/test/java/org/redisson/misc/NoneCacheMapTest.java
index 7a56f187a..63f5a58e8 100644
--- a/redisson/src/test/java/org/redisson/misc/NoneCacheMapTest.java
+++ b/redisson/src/test/java/org/redisson/misc/NoneCacheMapTest.java
@@ -3,19 +3,11 @@ package org.redisson.misc;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.concurrent.TimeUnit;
-import org.junit.ClassRule;
-import org.junit.Rule;
 
 import org.junit.Test;
-import org.junit.rules.Timeout;
 
 public class NoneCacheMapTest {
 
-    @ClassRule
-    public static Timeout classTimeout = new Timeout(1, TimeUnit.HOURS);
-    @Rule
-    public Timeout testTimeout = new Timeout(15, TimeUnit.MINUTES);
-
     @Test
     public void testMaxIdleTimeEviction() throws InterruptedException {
         Cache<Integer, Integer> map = new NoneCacheMap<Integer, Integer>(0, 0);
diff --git a/redisson/src/test/java/org/redisson/spring/cache/RedissonSpringCacheTest.java b/redisson/src/test/java/org/redisson/spring/cache/RedissonSpringCacheTest.java
index 5a27ae67f..28e6b6bc5 100644
--- a/redisson/src/test/java/org/redisson/spring/cache/RedissonSpringCacheTest.java
+++ b/redisson/src/test/java/org/redisson/spring/cache/RedissonSpringCacheTest.java
@@ -6,13 +6,9 @@ import java.io.IOException;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.TimeUnit;
 
 import org.junit.AfterClass;
-import org.junit.ClassRule;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.Timeout;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.redisson.BaseTest;
@@ -34,11 +30,6 @@ import org.springframework.stereotype.Service;
 @RunWith(Parameterized.class)
 public class RedissonSpringCacheTest {
 
-    @ClassRule
-    public static Timeout classTimeout = new Timeout(1, TimeUnit.HOURS);
-    @Rule
-    public Timeout testTimeout = new Timeout(15, TimeUnit.MINUTES);
-
     public static class SampleObject {
 
         private String name;