diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 973402d8d6a..a54d4e0595e 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -84,6 +84,8 @@ Release 0.23.1 - Unreleased
   OPTIMIZATIONS
 
   BUG FIXES
+    MAPREDUCE-2950. [Rumen] Fixed TestUserResolve. (Ravi Gummadi via amarrk)
+
     MAPREDUCE-3412. Fix 'ant docs'. (amarrk)
 
     MAPREDUCE-3346 [Rumen] LoggedTaskAttempt#getHostName() returns null.
diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestUserResolve.java b/hadoop-mapreduce-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestUserResolve.java
index 26d35008bb2..8050f33b794 100644
--- a/hadoop-mapreduce-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestUserResolve.java
+++ b/hadoop-mapreduce-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestUserResolve.java
@@ -106,7 +106,7 @@ public class TestUserResolve {
     // Check if the error message is as expected for non existent
     // user resource file.
     fs.delete(usersFilePath, false);
-    String expectedErrorMsg = "File " + userRsrc + " does not exist.";
+    String expectedErrorMsg = "File " + userRsrc + " does not exist";
     validateBadUsersFile(rslv, userRsrc, expectedErrorMsg);
 
     // Check if the error message is as expected for empty user resource file