diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 3749d59fe34..51c4d940497 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -865,6 +865,8 @@ Release 2.6.0 - UNRELEASED
     schedulers about previous finished attempts of a running appliation to avoid
     expectation mismatch w.r.t transferred containers. (Jian He via vinodkv)
 
+    YARN-2810. TestRMProxyUsersConf fails on Windows VMs. (Varun Vasudev via xgong)
+
 Release 2.5.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMProxyUsersConf.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMProxyUsersConf.java
index 86a9fe48f8e..f6d239d9a95 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMProxyUsersConf.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMProxyUsersConf.java
@@ -38,6 +38,7 @@ public class TestRMProxyUsersConf {
       UserGroupInformation.createUserForTesting("foo", new String[] { "foo_group" });
   private static final UserGroupInformation BAR_USER =
       UserGroupInformation.createUserForTesting("bar", new String[] { "bar_group" });
+  private final String ipAddress = "127.0.0.1";
 
   @Parameterized.Parameters
   public static Collection<Object[]> headers() {
@@ -51,13 +52,13 @@ public class TestRMProxyUsersConf {
     switch (round) {
       case 0:
         // hadoop.proxyuser prefix
-        conf.set("hadoop.proxyuser.foo.hosts", "localhost");
+        conf.set("hadoop.proxyuser.foo.hosts", ipAddress);
         conf.set("hadoop.proxyuser.foo.users", "bar");
         conf.set("hadoop.proxyuser.foo.groups", "bar_group");
         break;
       case 1:
         // yarn.resourcemanager.proxyuser prefix
-        conf.set("yarn.resourcemanager.proxyuser.foo.hosts", "localhost");
+        conf.set("yarn.resourcemanager.proxyuser.foo.hosts", ipAddress);
         conf.set("yarn.resourcemanager.proxyuser.foo.users", "bar");
         conf.set("yarn.resourcemanager.proxyuser.foo.groups", "bar_group");
         break;
@@ -67,7 +68,7 @@ public class TestRMProxyUsersConf {
         conf.set("hadoop.proxyuser.foo.hosts", "xyz");
         conf.set("hadoop.proxyuser.foo.users", "xyz");
         conf.set("hadoop.proxyuser.foo.groups", "xyz");
-        conf.set("yarn.resourcemanager.proxyuser.foo.hosts", "localhost");
+        conf.set("yarn.resourcemanager.proxyuser.foo.hosts", ipAddress);
         conf.set("yarn.resourcemanager.proxyuser.foo.users", "bar");
         conf.set("yarn.resourcemanager.proxyuser.foo.groups", "bar_group");
         break;
@@ -89,7 +90,7 @@ public class TestRMProxyUsersConf {
               BAR_USER.getShortUserName(), FOO_USER);
       try {
         ProxyUsers.getDefaultImpersonationProvider().authorize(proxyUser,
-            "localhost");
+            ipAddress);
       } catch (AuthorizationException e) {
         // Exception is not expected
         Assert.fail();