diff --git a/activemq-broker/pom.xml b/activemq-broker/pom.xml
index f942a3df87..1c7c346e95 100755
--- a/activemq-broker/pom.xml
+++ b/activemq-broker/pom.xml
@@ -174,7 +174,8 @@
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <argLine>${surefire.argLine}</argLine>
           <runOrder>alphabetical</runOrder>
           <systemProperties>
diff --git a/activemq-camel/pom.xml b/activemq-camel/pom.xml
index b6bc4fb07f..6d27ccaf56 100755
--- a/activemq-camel/pom.xml
+++ b/activemq-camel/pom.xml
@@ -178,7 +178,8 @@
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <forkMode>pertest</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <childDelegation>false</childDelegation>
           <useFile>true</useFile>
           <argLine>-Xmx512M</argLine>
diff --git a/activemq-client/pom.xml b/activemq-client/pom.xml
index f4ff115057..18f940bc88 100755
--- a/activemq-client/pom.xml
+++ b/activemq-client/pom.xml
@@ -200,7 +200,8 @@
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <argLine>${surefire.argLine}</argLine>
           <runOrder>alphabetical</runOrder>
           <systemProperties>
diff --git a/activemq-console/pom.xml b/activemq-console/pom.xml
index ef50ba00dc..643269fad6 100644
--- a/activemq-console/pom.xml
+++ b/activemq-console/pom.xml
@@ -154,7 +154,8 @@
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <forkMode>pertest</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <childDelegation>false</childDelegation>
           <useFile>true</useFile>
           <systemProperties>
diff --git a/activemq-http/pom.xml b/activemq-http/pom.xml
index 907d4858cf..3ed05a2b3a 100755
--- a/activemq-http/pom.xml
+++ b/activemq-http/pom.xml
@@ -154,7 +154,8 @@
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <forkMode>always</forkMode>
+            <forkCount>1</forkCount>
+            <reuseForks>false</reuseForks>
         </configuration>
       </plugin>
     </plugins>
diff --git a/activemq-jdbc-store/pom.xml b/activemq-jdbc-store/pom.xml
index 15122ccb23..52cf40d1e0 100755
--- a/activemq-jdbc-store/pom.xml
+++ b/activemq-jdbc-store/pom.xml
@@ -70,7 +70,8 @@
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <forkMode>always</forkMode>
+            <forkCount>1</forkCount>
+            <reuseForks>false</reuseForks>
           <argLine>${surefire.argLine}</argLine>
           <runOrder>alphabetical</runOrder>
           <systemProperties>
diff --git a/activemq-kahadb-store/pom.xml b/activemq-kahadb-store/pom.xml
index 79185ace31..e2fffc571c 100755
--- a/activemq-kahadb-store/pom.xml
+++ b/activemq-kahadb-store/pom.xml
@@ -176,7 +176,8 @@
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <argLine>${surefire.argLine}</argLine>
           <runOrder>alphabetical</runOrder>
 
diff --git a/activemq-karaf-itest/pom.xml b/activemq-karaf-itest/pom.xml
index 7622ac6286..0a819f2a5b 100644
--- a/activemq-karaf-itest/pom.xml
+++ b/activemq-karaf-itest/pom.xml
@@ -190,7 +190,8 @@
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <forkMode>pertest</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <redirectTestOutputToFile>false</redirectTestOutputToFile>
           <argLine>-Xmx256m</argLine>
           <excludes>
diff --git a/activemq-leveldb-store/pom.xml b/activemq-leveldb-store/pom.xml
index 0e4502f18d..1b7bbaa504 100644
--- a/activemq-leveldb-store/pom.xml
+++ b/activemq-leveldb-store/pom.xml
@@ -382,7 +382,6 @@
         <configuration>
           <!-- we must turn off the use of system class loader so our tests can find stuff - otherwise ScalaSupport compiler can't find stuff -->
           <useSystemClassLoader>false</useSystemClassLoader>
-          <!--forkMode>pertest</forkMode-->
           <childDelegation>false</childDelegation>
           <useFile>true</useFile>
           <failIfNoTests>false</failIfNoTests>
diff --git a/activemq-mqtt/pom.xml b/activemq-mqtt/pom.xml
index a1205e2896..022fc7cdcf 100755
--- a/activemq-mqtt/pom.xml
+++ b/activemq-mqtt/pom.xml
@@ -207,7 +207,8 @@
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <argLine>${surefire.argLine}</argLine>
           <runOrder>alphabetical</runOrder>
           <!-- Note: if you want to see log messages on the console window remove the following comment -->
diff --git a/activemq-ra/pom.xml b/activemq-ra/pom.xml
index 9ccfe93c29..efcdf4dd30 100755
--- a/activemq-ra/pom.xml
+++ b/activemq-ra/pom.xml
@@ -131,7 +131,9 @@
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <forkMode>pertest</forkMode>
+          <!--forkMode>pertest</forkMode-->
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <childDelegation>false</childDelegation>
           <useFile>true</useFile>
           <includes>
diff --git a/activemq-rar/pom.xml b/activemq-rar/pom.xml
index 48c97513e8..2daf4495b6 100644
--- a/activemq-rar/pom.xml
+++ b/activemq-rar/pom.xml
@@ -364,7 +364,8 @@
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <forkMode>pertest</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <childDelegation>false</childDelegation>
         </configuration>
       </plugin>
diff --git a/activemq-runtime-config/pom.xml b/activemq-runtime-config/pom.xml
index d66656fc6d..9a69ff1046 100755
--- a/activemq-runtime-config/pom.xml
+++ b/activemq-runtime-config/pom.xml
@@ -177,7 +177,8 @@
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <argLine>-Xmx512M -Djava.awt.headless=true</argLine>
           <systemProperties>
             <property>
diff --git a/activemq-stomp/pom.xml b/activemq-stomp/pom.xml
index e24da4b209..b23e0276ae 100755
--- a/activemq-stomp/pom.xml
+++ b/activemq-stomp/pom.xml
@@ -112,7 +112,8 @@
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <argLine>${surefire.argLine}</argLine>
           <runOrder>alphabetical</runOrder>
           <failIfNoTests>false</failIfNoTests>
diff --git a/activemq-unit-tests/pom.xml b/activemq-unit-tests/pom.xml
index dcda22f4e9..a86e51b55a 100755
--- a/activemq-unit-tests/pom.xml
+++ b/activemq-unit-tests/pom.xml
@@ -427,7 +427,8 @@
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <argLine>${surefire.argLine}</argLine>
           <runOrder>alphabetical</runOrder>
           <systemProperties>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 42b6c1a4ae..96593b8865 100755
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -477,7 +477,8 @@
              <goal>test</goal>
             </goals>
             <configuration>
-             <forkMode>pertest</forkMode>
+             <forkCount>1</forkCount>
+             <reuseForks>false</reuseForks>
              <environmentVariables>
                  <ACTIVEMQ_ENCRYPTION_PASSWORD>activemq</ACTIVEMQ_ENCRYPTION_PASSWORD>
              </environmentVariables>
diff --git a/pom.xml b/pom.xml
index e3a0b3ce74..d16dce3492 100755
--- a/pom.xml
+++ b/pom.xml
@@ -143,7 +143,7 @@
 
     <!-- Maven Plugin Version for this Project -->
     <maven-bundle-plugin-version>2.3.7</maven-bundle-plugin-version>
-    <maven-surefire-plugin-version>2.10</maven-surefire-plugin-version>
+    <maven-surefire-plugin-version>2.16</maven-surefire-plugin-version>
     <maven-antrun-plugin-version>1.3</maven-antrun-plugin-version>
     <maven-assembly-plugin-version>2.4</maven-assembly-plugin-version>
     <maven-release-plugin-version>2.4.1</maven-release-plugin-version>
@@ -1133,7 +1133,8 @@
           <version>${maven-surefire-plugin-version}</version>
           <configuration>
             <redirectTestOutputToFile>true</redirectTestOutputToFile>
-            <forkMode>once</forkMode>
+              <forkCount>1</forkCount>
+              <reuseForks>true</reuseForks>
             <argLine>-enableassertions</argLine>
             <failIfNoTests>false</failIfNoTests>
           </configuration>