diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index f017d0b771..4ca1678188 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -160,6 +160,9 @@ Release 2.5.0 - UNRELEASED
     MAPREDUCE-5456. TestFetcher.testCopyFromHostExtraBytes is missing (Jason
     Lowe via jeagles)
 
+    MAPREDUCE-5804. TestMRJobsWithProfiler#testProfiler timesout (Mit Desai
+    via kihwal)
+
   OPTIMIZATIONS
 
   BUG FIXES 
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestMRJobsWithProfiler.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestMRJobsWithProfiler.java
index de17528d7f..ac8189655f 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestMRJobsWithProfiler.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestMRJobsWithProfiler.java
@@ -104,7 +104,7 @@ public class TestMRJobsWithProfiler {
   }
 
 
-  @Test (timeout = 120000)
+  @Test (timeout = 150000)
   public void testProfiler() throws IOException, InterruptedException,
       ClassNotFoundException {
     if (!(new File(MiniMRYarnCluster.APPJAR)).exists()) {