diff --git a/CHANGES.txt b/CHANGES.txt
index 9e1d499..6343b62 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -271,6 +271,9 @@
     MAPREDUCE-1375. Fixes flaky test TestFileArgs. (Todd Lipcon via
     amareshwari)
 
+    MAPREDUCE-2023. TestDFSIO should not stop reading if curSize != bufferSize.
+    (Hong Tang via szetszwo)
+
 Release 0.21.0 - Unreleased
 
   INCOMPATIBLE CHANGES
diff --git a/src/test/mapred/org/apache/hadoop/fs/TestDFSIO.java b/src/test/mapred/org/apache/hadoop/fs/TestDFSIO.java
index eff17ad..896240e 100644
--- a/src/test/mapred/org/apache/hadoop/fs/TestDFSIO.java
+++ b/src/test/mapred/org/apache/hadoop/fs/TestDFSIO.java
@@ -397,9 +397,8 @@
       DataInputStream in = fs.open(new Path(getDataDir(getConf()), name));
       long actualSize = 0;
       try {
-        for(int curSize = bufferSize;
-                curSize == bufferSize && actualSize < totalSize;) {
-          curSize = in.read(buffer, 0, bufferSize);
+        while (actualSize < totalSize) {
+          int curSize = in.read(buffer, 0, bufferSize);
           if(curSize < 0) break;
           actualSize += curSize;
           reporter.setStatus("reading " + name + "@" +