diff --git a/CHANGES.txt b/CHANGES.txt
index 52bd5d3..397f68f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -124,6 +124,9 @@
     MAPREDUCE-2395. TestBlockFixer timing out on trunk. (Ramkumar Vadali via
     todd)
 
+    MAPREDUCE-2426. Make TestFairSchedulerSystem fail with more verbose output
+    (todd)
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES
diff --git a/src/contrib/fairscheduler/src/test/org/apache/hadoop/mapred/TestFairSchedulerSystem.java b/src/contrib/fairscheduler/src/test/org/apache/hadoop/mapred/TestFairSchedulerSystem.java
index db38a88..f33697d 100644
--- a/src/contrib/fairscheduler/src/test/org/apache/hadoop/mapred/TestFairSchedulerSystem.java
+++ b/src/contrib/fairscheduler/src/test/org/apache/hadoop/mapred/TestFairSchedulerSystem.java
@@ -155,7 +155,8 @@
     }
 
     String contents = sb.toString();
-    assertTrue(contents.contains("Fair Scheduler Administration"));
+    assertTrue("Bad contents for fair scheduler servlet: " + contents,
+      contents.contains("Fair Scheduler Administration"));
   }
 
   private void checkTaskGraphServlet(JobID job) throws Exception {
@@ -169,7 +170,8 @@
 
     // Just to be sure, slurp the content and make sure it looks like the scheduler
     String contents = slurpContents(connection);
-    assertTrue(contents.contains("</svg>"));
+    assertTrue("Bad contents for job " + job + ":\n" + contents,
+      contents.contains("</svg>"));
   }
 
   private String slurpContents(HttpURLConnection connection) throws Exception {