diff --git a/core-annotations/pom.xml b/core-annotations/pom.xml
index c388df7..d61876c 100644
--- a/core-annotations/pom.xml
+++ b/core-annotations/pom.xml
@@ -33,6 +33,17 @@
   
   <dependencies>
     <dependency>
+      <groupId>org.apache.directory.junit</groupId>
+      <artifactId>junit-addons</artifactId>
+      <scope>test</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+
+    <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
       <scope>test</scope>
diff --git a/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceFactoryTest.java b/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceFactoryTest.java
index 7d82b91..f91f379 100644
--- a/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceFactoryTest.java
+++ b/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceFactoryTest.java
@@ -23,9 +23,13 @@
 
 import static org.junit.Assert.assertTrue;
 
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
 import org.apache.directory.api.util.FileUtils;
 import org.apache.directory.server.core.api.DirectoryService;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 
 /**
@@ -33,6 +37,8 @@
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@RunWith(ConcurrentJunitRunner.class)
+@Concurrency()
 public class DirectoryServiceFactoryTest
 {
     @Test