diff --git a/redisson/src/test/java/org/redisson/BaseReactiveTest.java b/redisson/src/test/java/org/redisson/BaseReactiveTest.java
index 8270540d3..f3c7919f6 100644
--- a/redisson/src/test/java/org/redisson/BaseReactiveTest.java
+++ b/redisson/src/test/java/org/redisson/BaseReactiveTest.java
@@ -9,6 +9,7 @@ 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;
@@ -22,7 +23,9 @@ import reactor.rx.Streams;
 public abstract class BaseReactiveTest {
 
     @ClassRule
-    public static Timeout classTimeout = new Timeout(15, TimeUnit.MINUTES);
+    public static Timeout classTimeout = new Timeout(1, TimeUnit.HOURS);
+    @Rule
+    public static 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 8721fb7b9..e8d7a0cdf 100644
--- a/redisson/src/test/java/org/redisson/BaseTest.java
+++ b/redisson/src/test/java/org/redisson/BaseTest.java
@@ -7,6 +7,7 @@ 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;
@@ -15,7 +16,9 @@ import org.redisson.config.Config;
 public abstract class BaseTest {
     
     @ClassRule
-    public static Timeout classTimeout = new Timeout(15, TimeUnit.MINUTES);
+    public static Timeout classTimeout = new Timeout(1, TimeUnit.HOURS);
+    @Rule
+    public static 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 855dfe1fe..3c814b5d8 100644
--- a/redisson/src/test/java/org/redisson/RedisClientTest.java
+++ b/redisson/src/test/java/org/redisson/RedisClientTest.java
@@ -35,12 +35,15 @@ 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(15, TimeUnit.MINUTES);
+    public static Timeout classTimeout = new Timeout(1, TimeUnit.HOURS);
+    @Rule
+    public static Timeout testTimeout = new Timeout(15, TimeUnit.MINUTES);
 
     @BeforeClass
     public static void beforeClass() throws IOException, InterruptedException {
diff --git a/redisson/src/test/java/org/redisson/RedissonCountDownLatchConcurrentTest.java b/redisson/src/test/java/org/redisson/RedissonCountDownLatchConcurrentTest.java
index b027d9cbb..f2d7f390a 100644
--- a/redisson/src/test/java/org/redisson/RedissonCountDownLatchConcurrentTest.java
+++ b/redisson/src/test/java/org/redisson/RedissonCountDownLatchConcurrentTest.java
@@ -12,6 +12,7 @@ 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;
@@ -20,7 +21,9 @@ import org.redisson.api.RedissonClient;
 public class RedissonCountDownLatchConcurrentTest {
     
     @ClassRule
-    public static Timeout classTimeout = new Timeout(15, TimeUnit.MINUTES);
+    public static Timeout classTimeout = new Timeout(1, TimeUnit.HOURS);
+    @Rule
+    public static Timeout testTimeout = new Timeout(15, TimeUnit.MINUTES);
 
     @BeforeClass
     public static void beforeClass() throws IOException, InterruptedException {
diff --git a/redisson/src/test/java/org/redisson/RedissonMultiLockTest.java b/redisson/src/test/java/org/redisson/RedissonMultiLockTest.java
index 5676139d5..3e6d547df 100644
--- a/redisson/src/test/java/org/redisson/RedissonMultiLockTest.java
+++ b/redisson/src/test/java/org/redisson/RedissonMultiLockTest.java
@@ -15,12 +15,15 @@ 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(15, TimeUnit.MINUTES);
+    public static Timeout classTimeout = new Timeout(1, TimeUnit.HOURS);
+    @Rule
+    public static Timeout testTimeout = new Timeout(15, TimeUnit.MINUTES);
 
     @Test
     public void testMultiThreads() throws IOException, InterruptedException {
diff --git a/redisson/src/test/java/org/redisson/RedissonRedLockTest.java b/redisson/src/test/java/org/redisson/RedissonRedLockTest.java
index b45d4d282..9e71f298d 100644
--- a/redisson/src/test/java/org/redisson/RedissonRedLockTest.java
+++ b/redisson/src/test/java/org/redisson/RedissonRedLockTest.java
@@ -17,12 +17,15 @@ 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(15, TimeUnit.MINUTES);
+    public static Timeout classTimeout = new Timeout(1, TimeUnit.HOURS);
+    @Rule
+    public static Timeout testTimeout = new Timeout(15, TimeUnit.MINUTES);
 
     @Test
     public void testLockFailed() throws IOException, InterruptedException {
diff --git a/redisson/src/test/java/org/redisson/RedissonTest.java b/redisson/src/test/java/org/redisson/RedissonTest.java
index 71ea2c6be..2471cb465 100644
--- a/redisson/src/test/java/org/redisson/RedissonTest.java
+++ b/redisson/src/test/java/org/redisson/RedissonTest.java
@@ -33,13 +33,16 @@ 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(15, TimeUnit.MINUTES);
+    public static Timeout classTimeout = new Timeout(1, TimeUnit.HOURS);
+    @Rule
+    public static 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 119e89c9f..e2ccc8b4d 100644
--- a/redisson/src/test/java/org/redisson/RedissonTopicPatternTest.java
+++ b/redisson/src/test/java/org/redisson/RedissonTopicPatternTest.java
@@ -20,6 +20,7 @@ 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;
@@ -36,7 +37,9 @@ import org.redisson.config.Config;
 public class RedissonTopicPatternTest {
 
     @ClassRule
-    public static Timeout classTimeout = new Timeout(15, TimeUnit.MINUTES);
+    public static Timeout classTimeout = new Timeout(1, TimeUnit.HOURS);
+    @Rule
+    public static Timeout testTimeout = new Timeout(15, TimeUnit.MINUTES);
 
     @BeforeClass
     public static void beforeClass() throws IOException, InterruptedException {
diff --git a/redisson/src/test/java/org/redisson/RedissonTopicTest.java b/redisson/src/test/java/org/redisson/RedissonTopicTest.java
index 3b7014794..e96439e8d 100644
--- a/redisson/src/test/java/org/redisson/RedissonTopicTest.java
+++ b/redisson/src/test/java/org/redisson/RedissonTopicTest.java
@@ -37,12 +37,15 @@ 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(15, TimeUnit.MINUTES);
+    public static Timeout classTimeout = new Timeout(1, TimeUnit.HOURS);
+    @Rule
+    public static Timeout testTimeout = new Timeout(15, TimeUnit.MINUTES);
 
     @BeforeClass
     public static void beforeClass() throws IOException, InterruptedException {
diff --git a/redisson/src/test/java/org/redisson/RedissonTwoLockedThread.java b/redisson/src/test/java/org/redisson/RedissonTwoLockedThread.java
index c58032ab0..f58c9deae 100644
--- a/redisson/src/test/java/org/redisson/RedissonTwoLockedThread.java
+++ b/redisson/src/test/java/org/redisson/RedissonTwoLockedThread.java
@@ -21,6 +21,7 @@ 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;
 
@@ -28,7 +29,9 @@ import static org.redisson.BaseTest.createInstance;
 public class RedissonTwoLockedThread {
 
     @ClassRule
-    public static Timeout classTimeout = new Timeout(15, TimeUnit.MINUTES);
+    public static Timeout classTimeout = new Timeout(1, TimeUnit.HOURS);
+    @Rule
+    public static Timeout testTimeout = new Timeout(15, TimeUnit.MINUTES);
 
     @Parameterized.Parameters(name= "{index} - {0}")
     public static Iterable<Object[]> data() {