diff --git a/redisson-tomcat/redisson-tomcat-7/src/test/java/org/redisson/tomcat/TomcatServer.java b/redisson-tomcat/redisson-tomcat-7/src/test/java/org/redisson/tomcat/TomcatServer.java
index 16c6a25f9..6ec7af3b6 100644
--- a/redisson-tomcat/redisson-tomcat-7/src/test/java/org/redisson/tomcat/TomcatServer.java
+++ b/redisson-tomcat/redisson-tomcat-7/src/test/java/org/redisson/tomcat/TomcatServer.java
@@ -54,6 +54,7 @@ public class TomcatServer {
 
         tomcat.stop();
         tomcat.destroy();
+        tomcat.getServer().await();
         isRunning = false;
     }
 
diff --git a/redisson-tomcat/redisson-tomcat-8/src/test/java/org/redisson/tomcat/TomcatServer.java b/redisson-tomcat/redisson-tomcat-8/src/test/java/org/redisson/tomcat/TomcatServer.java
index 16c6a25f9..6ec7af3b6 100644
--- a/redisson-tomcat/redisson-tomcat-8/src/test/java/org/redisson/tomcat/TomcatServer.java
+++ b/redisson-tomcat/redisson-tomcat-8/src/test/java/org/redisson/tomcat/TomcatServer.java
@@ -54,6 +54,7 @@ public class TomcatServer {
 
         tomcat.stop();
         tomcat.destroy();
+        tomcat.getServer().await();
         isRunning = false;
     }