diff --git a/pom.xml b/pom.xml
index f9425ffb1d5..5e4cd40991e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,6 +135,10 @@
         </surefire.system.args>
         <test.level>INFO</test.level>
 
+        <!-- This overrides default surefire plugin version specified in parent pom - reason is to enable TCP/IP communication,
+             see https://maven.apache.org/surefire/maven-surefire-plugin/examples/process-communication.html -->
+	<version.surefire.plugin>3.1.2</version.surefire.plugin>
+
         <!-- Non-default maven plugin versions and configuration -->
         <version.jacoco.plugin>0.8.10</version.jacoco.plugin>
         <version.org.jboss.galleon>5.0.9.Final</version.org.jboss.galleon>
@@ -356,6 +360,7 @@
                         </dependency>
                     </dependencies>
                     <configuration>
+                        <forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory"/>
                         <redirectTestOutputToFile>true</redirectTestOutputToFile>
                         <enableAssertions>true</enableAssertions>
                         <systemPropertyVariables>
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index 406e2adb37d..78dffb31d4a 100644
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -323,6 +323,7 @@
                     <artifactId>maven-surefire-plugin</artifactId>
                     <configuration>
                         <failIfNoTests>false</failIfNoTests>
+			<forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory"/>
                         <redirectTestOutputToFile>${testLogToFile}</redirectTestOutputToFile>
                         <argLine>-Djava.util.logging.manager=org.jboss.logmanager.LogManager</argLine>
                         <systemPropertyVariables>