diff --git a/pom.xml b/pom.xml
index c4081df..a49e51a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -762,9 +762,13 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-plugin</artifactId>
-					<version>3.0.0-M3</version>
+					<version>3.0.0-M5</version>
 					<configuration>
-						<forkMode>always</forkMode> <!-- integration tests require it -->
+						<parallel>classes</parallel> <!-- each class in its own JVM-->
+						<threadCountClasses>10</threadCountClasses>
+						<forkCount>3</forkCount> <!-- 3 JVMs at build time -->
+						<reuseForks>true</reuseForks> <!-- reuse the JVMs across classes -->
+						<reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
 					</configuration>
 				</plugin>