diff --git a/pom.xml b/pom.xml
index c4081df..165ec31 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.test.outputDirectory}</reportsDirectory>
 					</configuration>
 				</plugin>
 
@@ -1081,6 +1085,8 @@
 		<!-- default value for the distro directory -->
 		<distroDirectory>distro</distroDirectory>
 
+		<project.test.outputDirectory>${project.build.directory}/surefire-reports</project.test.outputDirectory>
+
 		<java_version>1.8</java_version>
 		<java.expected.vm>.*OpenJDK.*</java.expected.vm>
 		<maven.compiler.source>${java_version}</maven.compiler.source>