diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml
index d215b43e1abd6..e0c80bc45fc1b 100644
--- a/hadoop-common-project/hadoop-common/pom.xml
+++ b/hadoop-common-project/hadoop-common/pom.xml
@@ -1000,6 +1000,7 @@
org.apache.maven.plugins
maven-surefire-plugin
+ ${ignoreTestFailure}
${testsThreadCount}
false
${maven-surefire-plugin.argLine} -DminiClusterDedicatedDirs=true
diff --git a/hadoop-common-project/hadoop-kms/pom.xml b/hadoop-common-project/hadoop-kms/pom.xml
index 5d3f9f6ddffb6..bded0b5cf7d48 100644
--- a/hadoop-common-project/hadoop-kms/pom.xml
+++ b/hadoop-common-project/hadoop-kms/pom.xml
@@ -186,6 +186,7 @@
org.apache.maven.plugins
maven-surefire-plugin
+ ${ignoreTestFailure}
1
false
1
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
index e951320242b0a..e398bfb26d8fe 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
@@ -247,6 +247,7 @@
org.apache.maven.plugins
maven-surefire-plugin
+ ${ignoreTestFailure}
1
600
@@ -361,6 +362,7 @@
org.apache.maven.plugins
maven-surefire-plugin
+ ${ignoreTestFailure}
1
true
600
diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
index 820879dd34a1d..c2b6f954765d1 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
@@ -507,6 +507,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
org.apache.maven.plugins
maven-surefire-plugin
+ ${ignoreTestFailure}
${testsThreadCount}
false
${maven-surefire-plugin.argLine} -DminiClusterDedicatedDirs=true
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 0c1ad0b86e34d..e33ce51f5a723 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -34,6 +34,8 @@
2021
false
+
+ true
true
9.4.40.v20210413
_
@@ -1758,6 +1760,7 @@
org.apache.maven.plugins
maven-surefire-plugin
+ ${ignoreTestFailure}
false
${surefire.fork.timeout}
${maven-surefire-plugin.argLine}
diff --git a/hadoop-tools/hadoop-distcp/pom.xml b/hadoop-tools/hadoop-distcp/pom.xml
index 223f0183d0977..72b6b5bb76acf 100644
--- a/hadoop-tools/hadoop-distcp/pom.xml
+++ b/hadoop-tools/hadoop-distcp/pom.xml
@@ -123,6 +123,7 @@
org.apache.maven.plugins
maven-surefire-plugin
+ ${ignoreTestFailure}
1
false
600
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/pom.xml
index dbddbb3d97b3d..36f6cf2c06d86 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/pom.xml
@@ -225,6 +225,7 @@
org.apache.maven.plugins
maven-surefire-plugin
+ ${ignoreTestFailure}
false
900
-Xmx1024m -XX:+HeapDumpOnOutOfMemoryError