diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 9967dc9afe..94877c53db 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -623,6 +623,9 @@ Release 2.1.0-beta - UNRELEASED
     HADOOP-9632. TestShellCommandFencer will fail if there is a 'host' machine in
     the network. (Chuan Liu via cnauroth)
 
+    HADOOP-9624. TestFSMainOperationsLocalFileSystem failed when the Hadoop test
+    root path has "X" in its name. (Xi Fang via cnauroth)
+
   BREAKDOWN OF HADOOP-8562 SUBTASKS AND RELATED JIRAS
 
     HADOOP-8924. Hadoop Common creating package-info.java must not depend on
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FSMainOperationsBaseTest.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FSMainOperationsBaseTest.java
index 8506ea9bee..807f0cccb5 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FSMainOperationsBaseTest.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FSMainOperationsBaseTest.java
@@ -71,7 +71,7 @@ public boolean accept(final Path file) {
     }
   };
 
-  //A test filter with returns any path containing a "b" 
+  //A test filter with returns any path containing an "x" or "X"
   final private static PathFilter TEST_X_FILTER = new PathFilter() {
     @Override
     public boolean accept(Path file) {
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextMainOperationsBaseTest.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextMainOperationsBaseTest.java
index 2cf611fc70..354f7aabfd 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextMainOperationsBaseTest.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextMainOperationsBaseTest.java
@@ -81,7 +81,7 @@ public boolean accept(final Path file) {
     }
   };
 
-  //A test filter with returns any path containing a "b" 
+  //A test filter with returns any path containing an "x" or "X" 
   final private static PathFilter TEST_X_FILTER = new PathFilter() {
     @Override
     public boolean accept(Path file) {