diff --git a/pom.xml b/pom.xml
index 9c34fddba..31abf6bdc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -652,9 +652,8 @@ under the License.
               <java.io.tmpdir>${project.build.directory}/tmp</java.io.tmpdir>
             </systemProperties>
             <!-- Enable parallelism on test suites. Each suite uses its own JVM -->
-            <parallel>suites</parallel>
-            <forkMode>perSuite</forkMode>
-            <forkCount>2</forkCount>
+            <parallel>true</parallel>
+            <forkMode>always</forkMode>
           </configuration>
           <executions>
             <execution>