diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index b288c50763f..f84e9ca7351 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -560,6 +560,9 @@ Release 2.6.0 - UNRELEASED
     HDFS-7051. TestDataNodeRollingUpgrade#isBlockFileInPrevious assumes Unix file
     path separator. (cnauroth)
 
+    HDFS-7105. Fix TestJournalNode#testFailToStartWithBadConfig to match log
+    output change. (Ray Chiang via cnauroth)
+
 Release 2.5.1 - 2014-09-05
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/server/TestJournalNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/server/TestJournalNode.java
index 10b6b791175..56a4348da89 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/server/TestJournalNode.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/server/TestJournalNode.java
@@ -292,7 +292,7 @@ public class TestJournalNode {
     // Directory which cannot be created
     conf.set(DFSConfigKeys.DFS_JOURNALNODE_EDITS_DIR_KEY,
         Shell.WINDOWS ? "\\\\cannotBeCreated" : "/proc/does-not-exist");
-    assertJNFailsToStart(conf, "Can not create directory");
+    assertJNFailsToStart(conf, "Cannot create directory");
   }
 
   private static void assertJNFailsToStart(Configuration conf,