diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
index 32b873b3af6..6125dea1e33 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
@@ -248,7 +248,6 @@ public class NameNode extends ReconfigurableBase implements
     DFS_NAMENODE_RPC_BIND_HOST_KEY,
     DFS_NAMENODE_NAME_DIR_KEY,
     DFS_NAMENODE_EDITS_DIR_KEY,
-    DFS_NAMENODE_SHARED_EDITS_DIR_KEY,
     DFS_NAMENODE_CHECKPOINT_DIR_KEY,
     DFS_NAMENODE_CHECKPOINT_EDITS_DIR_KEY,
     DFS_NAMENODE_LIFELINE_RPC_ADDRESS_KEY,
@@ -278,7 +277,8 @@ public class NameNode extends ReconfigurableBase implements
    * for a specific namenode.
    */
   public static final String[] NAMESERVICE_SPECIFIC_KEYS = {
-    DFS_HA_AUTO_FAILOVER_ENABLED_KEY
+      DFS_HA_AUTO_FAILOVER_ENABLED_KEY,
+      DFS_NAMENODE_SHARED_EDITS_DIR_KEY
   };
 
   private String ipcClientRPCBackoffEnable;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSUtil.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSUtil.java
index 39f76a57207..64d2322072e 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSUtil.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSUtil.java
@@ -402,7 +402,7 @@ public class TestDFSUtil {
   public void testSomeConfsNNSpecificSomeNSSpecific() {
     final HdfsConfiguration conf = new HdfsConfiguration();
 
-    String key = DFSConfigKeys.DFS_NAMENODE_SHARED_EDITS_DIR_KEY;
+    String key = DFSConfigKeys.DFS_NAMENODE_EDITS_DIR_KEY;
     conf.set(key, "global-default");
     conf.set(key + ".ns1", "ns1-override");
     conf.set(key + ".ns1.nn1", "nn1-override");