diff --git a/okapi-core/pom.xml b/okapi-core/pom.xml
index 5c6b7a04..4d382b74 100644
--- a/okapi-core/pom.xml
+++ b/okapi-core/pom.xml
@@ -272,6 +272,7 @@
                     <include>**/*Performance.java</include>
                   </includes>
                   <systemPropertyVariables />
+                  <forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory"/>
                 </configuration>
               </execution>
             </executions>
diff --git a/pom.xml b/pom.xml
index 2ac87047..f534d940 100644
--- a/pom.xml
+++ b/pom.xml
@@ -253,7 +253,7 @@
 
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.22.2</version>
+        <version>3.0.0-M5</version>
       </plugin>
 
     </plugins>