diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 257509722eb..d7d0c0b69d3 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -937,6 +937,9 @@ Release 2.6.0 - UNRELEASED
     HDFS-7203. Concurrent appending to the same file can cause data corruption
     (kihwal)
 
+    HDFS-7236. Fix TestOpenFilesWithSnapshot#testOpenFilesWithMultipleSnapshots.
+    (Yongjun Zhang via jing9)
+
     BREAKDOWN OF HDFS-6134 AND HADOOP-10150 SUBTASKS AND RELATED JIRAS
   
       HDFS-6387. HDFS CLI admin tool for creating & deleting an
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestOpenFilesWithSnapshot.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestOpenFilesWithSnapshot.java
index 97121f616bf..62041e8e3bc 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestOpenFilesWithSnapshot.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestOpenFilesWithSnapshot.java
@@ -175,6 +175,7 @@ public class TestOpenFilesWithSnapshot {
     fs.createSnapshot(path, "s2");
     fs.delete(new Path("/test/test"), true);
     fs.deleteSnapshot(path, "s2");
+    cluster.triggerBlockReports();
     if (saveNamespace) {
       NameNode nameNode = cluster.getNameNode();
       NameNodeAdapter.enterSafeMode(nameNode, false);