diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index d294246ecdb..a84acbfd1df 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -207,6 +207,9 @@ Release 2.6.0 - UNRELEASED
     MAPREDUCE-6125. TestContainerLauncherImpl sometimes fails (Mit Desai via
     jlowe)
 
+    MAPREDUCE-6115. TestPipeApplication#testSubmitter fails in trunk (Binglin
+    Chang via jlowe)
+
 Release 2.5.1 - 2014-09-05
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipeApplication.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipeApplication.java
index c2a990eec14..093388a530e 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipeApplication.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipeApplication.java
@@ -308,7 +308,7 @@ public class TestPipeApplication {
       assertTrue(out.toString().contains(
               "-fs <local|namenode:port>      specify a namenode"));
       assertTrue(out.toString().contains(
-              "-jt <local|ResourceManager:port>    specify a ResourceManager"));
+              "-jt <local|resourcemanager:port>    specify a ResourceManager"));
       assertTrue(out
               .toString()
               .contains(