diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index ab66fae08d9..094940a6dd7 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -752,9 +752,6 @@ Release 0.23.0 - Unreleased
     HDFS-2322. the build fails in Windows because commons-daemon TAR cannot be
     fetched. (tucu)
 
-    HDFS-2509. Add a test for DistributedFileSystem.getFileChecksum(..) on
-    directories or non existing files.  (Uma Maheswara Rao G via szetszwo)
-
     HDFS-2436. Change FSNamesystem.setTimes(..) for allowing setting times on
     directories.  (Uma Maheswara Rao G via szetszwo)
 
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDistributedFileSystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDistributedFileSystem.java
index c6f86b90c3b..0ea9f017865 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDistributedFileSystem.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDistributedFileSystem.java
@@ -412,26 +412,6 @@ public void testFileChecksum() throws Exception {
     final UserGroupInformation ugi = UserGroupInformation.createUserForTesting(
         current.getShortUserName() + "x", new String[]{"user"});
     
-    try {
-      ((DistributedFileSystem) hdfs).getFileChecksum(new Path(
-          "/test/TestNonExistingFile"));
-      fail("Expecting FileNotFoundException");
-    } catch (FileNotFoundException e) {
-      assertTrue("Not throwing the intended exception message", e.getMessage()
-          .contains("File does not exist: /test/TestNonExistingFile"));
-    }
-    
-    try {
-      Path path = new Path(
-      "/test/TestExistingDir/");
-      hdfs.mkdirs(path);
-      ((DistributedFileSystem) hdfs).getFileChecksum(path);
-      fail("Expecting FileNotFoundException");
-    } catch (FileNotFoundException e) {
-      assertTrue("Not throwing the intended exception message", e.getMessage()
-          .contains("File does not exist: /test/TestExistingDir"));
-    }
-    
     //hftp
     final String hftpuri = "hftp://" + nnAddr;
     System.out.println("hftpuri=" + hftpuri);