diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES_HDFS-5535.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES_HDFS-5535.txt
index cd84673e909..7eb6e792540 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES_HDFS-5535.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES_HDFS-5535.txt
@@ -108,3 +108,6 @@ HDFS-5535 subtasks:
 
     HDFS-6019. Standby NN might not checkpoint when processing the rolling
     upgrade marker. (Haohui Mai via jing9)
+
+    HDFS-6023. Test whether the standby NN continues to checkpoint after the
+    prepare stage. (Haohui Mai via jing9)
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NNStorage.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NNStorage.java
index dee6776ed67..3d2dba196af 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NNStorage.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NNStorage.java
@@ -676,7 +676,6 @@ public static String getRollbackImageFileName(long txid) {
     return getNameNodeFileName(NameNodeFile.IMAGE_ROLLBACK, txid);
   }
 
-  @VisibleForTesting
   private static String getNameNodeFileName(NameNodeFile nnf, long txid) {
     return String.format("%s_%019d", nnf.getName(), txid);
   }
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestRollingUpgrade.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestRollingUpgrade.java
index 4920bbf7fdb..cf3110651f2 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestRollingUpgrade.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestRollingUpgrade.java
@@ -34,6 +34,7 @@
 import org.apache.hadoop.hdfs.server.common.HdfsServerConstants.StartupOption;
 import org.apache.hadoop.hdfs.server.datanode.DataNode;
 import org.apache.hadoop.hdfs.server.namenode.FSImage;
+import org.apache.hadoop.hdfs.server.namenode.NNStorage;
 import org.apache.hadoop.hdfs.tools.DFSAdmin;
 import org.junit.Assert;
 import org.junit.Test;
@@ -467,17 +468,66 @@ public void testQuery() throws Exception {
     }
   }
 
+  @Test(timeout = 300000)
+  public void testCheckpoint() throws IOException, InterruptedException {
+    final Configuration conf = new Configuration();
+    conf.setInt(DFSConfigKeys.DFS_HA_TAILEDITS_PERIOD_KEY, 1);
+    conf.setInt(DFSConfigKeys.DFS_NAMENODE_CHECKPOINT_PERIOD_KEY, 1);
+
+    MiniQJMHACluster cluster = null;
+    final Path foo = new Path("/foo");
+
+    try {
+      cluster = new MiniQJMHACluster.Builder(conf).build();
+      MiniDFSCluster dfsCluster = cluster.getDfsCluster();
+      dfsCluster.waitActive();
+
+      dfsCluster.transitionToActive(0);
+      DistributedFileSystem dfs = dfsCluster.getFileSystem(0);
+
+      // start rolling upgrade
+      RollingUpgradeInfo info = dfs
+          .rollingUpgrade(RollingUpgradeAction.PREPARE);
+      Assert.assertTrue(info.isStarted());
+
+      queryForPreparation(dfs);
+
+      dfs.mkdirs(foo);
+      long txid = dfs.rollEdits();
+      Assert.assertTrue(txid > 0);
+
+      int retries = 0;
+      while (++retries < 5) {
+        NNStorage storage = dfsCluster.getNamesystem(1).getFSImage()
+            .getStorage();
+        if (storage.getFsImageName(txid - 1) != null) {
+          return;
+        }
+        Thread.sleep(1000);
+      }
+      Assert.fail("new checkpoint does not exist");
+
+    } finally {
+      if (cluster != null) {
+        cluster.shutdown();
+      }
+    }
+  }
+
   static void queryForPreparation(DistributedFileSystem dfs) throws IOException,
       InterruptedException {
     RollingUpgradeInfo info;
     int retries = 0;
-    while (retries < 10) {
+    while (++retries < 10) {
       info = dfs.rollingUpgrade(RollingUpgradeAction.QUERY);
       if (info.createdRollbackImages()) {
         break;
       }
       Thread.sleep(1000);
-      ++retries;
+    }
+
+    if (retries >= 10) {
+      Assert.fail("Query return false");
     }
   }
 }