diff --git a/pom.xml b/pom.xml
index 51c501721..aa3ea59fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -316,19 +316,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>${maven-surefire-plugin.version}</version>
-        <configuration>
-          <argLine>@{argLine}</argLine>
-          <systemPropertyVariables>
-            <log4j.configuration>
-              ${surefire-log4j.file}
-            </log4j.configuration>
-          </systemPropertyVariables>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
@@ -355,6 +342,20 @@
 
     <pluginManagement>
       <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>${maven-surefire-plugin.version}</version>
+          <configuration>
+            <rerunFailingTestsCount>3</rerunFailingTestsCount>
+            <argLine>@{argLine}</argLine>
+            <systemPropertyVariables>
+              <log4j.configuration>
+                ${surefire-log4j.file}
+              </log4j.configuration>
+            </systemPropertyVariables>
+          </configuration>
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
@@ -1167,6 +1168,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
+            <version>${maven-surefire-plugin.version}</version>
             <dependencies>
               <dependency>
                 <groupId>org.junit.jupiter</groupId>
@@ -1221,6 +1223,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
+            <version>${maven-surefire-plugin.version}</version>
             <dependencies>
               <dependency>
                 <groupId>org.apache.maven.surefire</groupId>
@@ -1273,6 +1276,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
+            <version>${maven-surefire-plugin.version}</version>
             <configuration combine.self="override">
               <skip>${skipUTs}</skip>
             </configuration>