diff --git a/mapreduce/CHANGES.txt b/mapreduce/CHANGES.txt
index fb38f21e02..9e1b1f4483 100644
--- a/mapreduce/CHANGES.txt
+++ b/mapreduce/CHANGES.txt
@@ -347,6 +347,9 @@ Trunk (unreleased changes)
     MAPREDUCE-2409. DistributedCache maps files and archives to the same path,
     despite semantic incompatibility. (Siddharth Seth via cdouglas)
 
+    MAPREDUCE-2575. TestMiniMRDFSCaching fails if test.build.dir is set 
+    to something other than build/test (Thomas Graves via mahadev)
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES
diff --git a/mapreduce/src/test/mapred/org/apache/hadoop/mapred/MRCaching.java b/mapreduce/src/test/mapred/org/apache/hadoop/mapred/MRCaching.java
index fcd29b0f55..02b6e58d0d 100644
--- a/mapreduce/src/test/mapred/org/apache/hadoop/mapred/MRCaching.java
+++ b/mapreduce/src/test/mapred/org/apache/hadoop/mapred/MRCaching.java
@@ -191,7 +191,7 @@ public static class TestResult {
 
   static void setupCache(String cacheDir, FileSystem fs) 
   throws IOException {
-    Path localPath = new Path("build/test/cache");
+    Path localPath = new Path(System.getProperty("test.cache.data", "build/test/cache"));
     Path txtPath = new Path(localPath, new Path("test.txt"));
     Path jarPath = new Path(localPath, new Path("test.jar"));
     Path zipPath = new Path(localPath, new Path("test.zip"));