diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 5147e38bdc..fad2707bc6 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -615,6 +615,9 @@ Release 2.8.0 - UNRELEASED
     HDFS-8552. Fix hdfs CLI usage message for namenode and zkfc.
     (Brahma Reddy Battula via xyao)
 
+    HDFS-8568. TestClusterId#testFormatWithEmptyClusterIdOption is failing.
+    (Rakesh R. via xyao)
+
   OPTIMIZATIONS
 
     HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestClusterId.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestClusterId.java
index 7c23dd55df..28ecd10b64 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestClusterId.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestClusterId.java
@@ -236,7 +236,7 @@ public void testFormatWithInvalidClusterIdOption() throws IOException {
     NameNode.createNameNode(argv, config);
 
     // Check if usage is printed
-    assertTrue(baos.toString("UTF-8").contains("Usage: java NameNode"));
+    assertTrue(baos.toString("UTF-8").contains("Usage: hdfs namenode"));
     System.setErr(origErr);
 
     // check if the version file does not exists.
@@ -262,7 +262,7 @@ public void testFormatWithNoClusterIdOption() throws IOException {
     NameNode.createNameNode(argv, config);
 
     // Check if usage is printed
-    assertTrue(baos.toString("UTF-8").contains("Usage: java NameNode"));
+    assertTrue(baos.toString("UTF-8").contains("Usage: hdfs namenode"));
     System.setErr(origErr);
 
     // check if the version file does not exists.
@@ -289,7 +289,7 @@ public void testFormatWithEmptyClusterIdOption() throws IOException {
     NameNode.createNameNode(argv, config);
 
     // Check if usage is printed
-    assertTrue(baos.toString("UTF-8").contains("Usage: java NameNode"));
+    assertTrue(baos.toString("UTF-8").contains("Usage: hdfs namenode"));
     System.setErr(origErr);
 
     // check if the version file does not exists.