diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 890cdabacf4..5a6d3e4c477 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -1043,6 +1043,9 @@ Release 2.8.0 - UNRELEASED
     YARN-4403. (AM/NM/Container)LivelinessMonitor should use monotonic time
     when calculating period. (Junping Du via jianhe)
 
+    YARN-4402. TestNodeManagerShutdown And TestNodeManagerResync fails with
+    bind exception. (Brahma Reddy Battula via jianhe)
+
 Release 2.7.3 - UNRELEASED
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerResync.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerResync.java
index 1a0412a1a5e..e8c4634e77e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerResync.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerResync.java
@@ -389,6 +389,9 @@ private YarnConfiguration createNMConfig(int port) throws IOException {
     conf.set(YarnConfiguration.NM_ADDRESS, "127.0.0.1:" + port);
     conf.set(YarnConfiguration.NM_LOCALIZER_ADDRESS, "127.0.0.1:"
         + ServerSocketUtil.getPort(49155, 10));
+    conf.set(YarnConfiguration.NM_WEBAPP_ADDRESS,
+        "127.0.0.1:" + ServerSocketUtil
+            .getPort(YarnConfiguration.DEFAULT_NM_WEBAPP_PORT, 10));
     conf.set(YarnConfiguration.NM_LOG_DIRS, logsDir.getAbsolutePath());
     conf.set(YarnConfiguration.NM_REMOTE_APP_LOG_DIR,
       remoteLogsDir.getAbsolutePath());
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerShutdown.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerShutdown.java
index 1fa5fbb262c..980c76440a9 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerShutdown.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerShutdown.java
@@ -272,6 +272,9 @@ private YarnConfiguration createNMConfig(int port) throws IOException {
     conf.set(YarnConfiguration.NM_ADDRESS, "127.0.0.1:" + port);
     conf.set(YarnConfiguration.NM_LOCALIZER_ADDRESS, "127.0.0.1:"
         + ServerSocketUtil.getPort(49158, 10));
+    conf.set(YarnConfiguration.NM_WEBAPP_ADDRESS,
+        "127.0.0.1:" + ServerSocketUtil
+            .getPort(YarnConfiguration.DEFAULT_NM_WEBAPP_PORT, 10));
     conf.set(YarnConfiguration.NM_LOG_DIRS, logsDir.getAbsolutePath());
     conf.set(YarnConfiguration.NM_REMOTE_APP_LOG_DIR, remoteLogsDir.getAbsolutePath());
     conf.set(YarnConfiguration.NM_LOCAL_DIRS, nmLocalDir.getAbsolutePath());