diff --git a/CHANGES.txt b/CHANGES.txt
index 04d69c9792..9db6bb08b2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1024,6 +1024,9 @@ Trunk (unreleased changes)
     HADOOP-6250. Modify test-patch to delete copied XML files before running
     patch build. (Rahul Kumar Singh via yhemanth)
 
+    HADOOP-6257. Two TestFileSystem classes are confusing
+    hadoop-hdfs-hdfwithmr. (Philip Zeyliger via tomwhite)
+
 Release 0.20.1 - Unreleased
 
   INCOMPATIBLE CHANGES
diff --git a/src/test/core/org/apache/hadoop/fs/TestFileSystem.java b/src/test/core/org/apache/hadoop/fs/TestFileSystemCaching.java
similarity index 97%
rename from src/test/core/org/apache/hadoop/fs/TestFileSystem.java
rename to src/test/core/org/apache/hadoop/fs/TestFileSystemCaching.java
index 9ef0ab5164..966ec6ae9a 100644
--- a/src/test/core/org/apache/hadoop/fs/TestFileSystem.java
+++ b/src/test/core/org/apache/hadoop/fs/TestFileSystemCaching.java
@@ -26,7 +26,7 @@
 import org.apache.hadoop.conf.Configuration;
 import org.junit.Test;
 
-public class TestFileSystem {
+public class TestFileSystemCaching {
 
   @Test
   public void testCacheEnabled() throws Exception {
@@ -36,7 +36,7 @@ public void testCacheEnabled() throws Exception {
     FileSystem fs2 = FileSystem.get(new URI("cachedfile://a"), conf);
     assertSame(fs1, fs2);
   }
-  
+
   @Test
   public void testCacheDisabled() throws Exception {
     Configuration conf = new Configuration();