diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index f6040d3a80..14ddff407f 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -69,6 +69,9 @@ Release 0.23.1 - Unreleased
     MAPREDUCE-3221. Reneabled the previously ignored test in TestSubmitJob
     and fixed bugs in it. (Devaraj K via vinodkv)
 
+    MAPREDUCE-3215. Reneabled and fixed bugs in the failing test
+    TestNoJobSetupCleanup. (Hitesh Shah via vinodkv)
+
 Release 0.23.0 - 2011-11-01 
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/TestNoJobSetupCleanup.java b/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/TestNoJobSetupCleanup.java
index 583572505b..1116d4cda6 100644
--- a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/TestNoJobSetupCleanup.java
+++ b/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/TestNoJobSetupCleanup.java
@@ -56,16 +56,15 @@ private Job submitAndValidateJob(Configuration conf, int numMaps, int numReds)
     FileSystem fs = FileSystem.get(conf);
     assertTrue("Job output directory doesn't exit!", fs.exists(outDir));
 
-    // TODO
-    /*
-    // Disabling check for now to address builds until we fix underlying issue
-    // output still in temporary as job commit only seems
-    // to be called during job cleanup 
-    FileStatus[] list = fs.listStatus(outDir, new OutputFilter());
+    // job commit done only in cleanup 
+    // therefore output should still be in temp location
+    String tempWorkingPathStr = outDir + Path.SEPARATOR + "_temporary"
+        + Path.SEPARATOR + "0";
+    Path tempWorkingPath = new Path(tempWorkingPathStr);
+    FileStatus[] list = fs.listStatus(tempWorkingPath, new OutputFilter());
     int numPartFiles = numReds == 0 ? numMaps : numReds;
     assertTrue("Number of part-files is " + list.length + " and not "
         + numPartFiles, list.length == numPartFiles);
-    */
     return job;
   }