diff --git a/server/sonar-main/src/test/java/org/sonar/application/cluster/HazelcastClusterTest.java b/server/sonar-main/src/test/java/org/sonar/application/cluster/HazelcastClusterTest.java
index <HASH>..<HASH> 100644
--- a/server/sonar-main/src/test/java/org/sonar/application/cluster/HazelcastClusterTest.java
+++ b/server/sonar-main/src/test/java/org/sonar/application/cluster/HazelcastClusterTest.java
@@ -33,7 +33,7 @@ import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-import org.junit.AfterClass;
+import org.junit.After;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.DisableOnDebug;
@@ -70,8 +70,8 @@ public class HazelcastClusterTest {
   @Rule
   public ExpectedException expectedException = ExpectedException.none();
 
-  @AfterClass
-  public static void closeHazelcastClients() {
+  @After
+  public void closeHazelcastClients() {
     closeAllHazelcastClients();
   }
Make HazelcastClusterTest more robust.