diff --git a/CHANGES.txt b/CHANGES.txt
index d75b23d1e8..192668c8a3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -261,6 +261,9 @@ Trunk (unreleased changes)
     HADOOP-7208. Fix implementation of equals() and hashCode() in
     StandardSocketFactory. (Uma Maheswara Rao G via todd)
 
+    HADOOP-7336. TestFileContextResolveAfs will fail with default 
+    test.build.data property. (jitendra)
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES
diff --git a/src/test/core/org/apache/hadoop/fs/TestFileContextResolveAfs.java b/src/test/core/org/apache/hadoop/fs/TestFileContextResolveAfs.java
index ca27ff5db5..90378f780a 100644
--- a/src/test/core/org/apache/hadoop/fs/TestFileContextResolveAfs.java
+++ b/src/test/core/org/apache/hadoop/fs/TestFileContextResolveAfs.java
@@ -33,7 +33,7 @@ import org.junit.Test;
 public class TestFileContextResolveAfs {
   
   private static String TEST_ROOT_DIR_LOCAL
-    = System.getProperty("test.build.data","build/test/data/work-dir/localfs");
+    = System.getProperty("test.build.data","/tmp");
   
   private FileContext fc;
   private FileSystem localFs;
@@ -48,8 +48,8 @@ public class TestFileContextResolveAfs {
     Configuration conf = new Configuration();
     localFs = FileSystem.get(conf);
     
-    Path localPath = new Path(TEST_ROOT_DIR_LOCAL + "/file1");
-    Path linkPath = new Path("file:///" + TEST_ROOT_DIR_LOCAL + "/file2");
+    Path localPath = new Path(TEST_ROOT_DIR_LOCAL + "/TestFileContextResolveAfs1");
+    Path linkPath = new Path("file://" + TEST_ROOT_DIR_LOCAL + "/TestFileContextResolveAfs2");
     localFs.mkdirs(new Path(TEST_ROOT_DIR_LOCAL));
     localFs.create(localPath);