diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index e4dc598177b..7ce5a096858 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -2135,6 +2135,9 @@ Release 2.8.0 - UNRELEASED
     HDFS-9301. HDFS clients can't construct HdfsConfiguration instances.
     (Mingliang Liu via wheat9)
 
+    HDFS-9304. Add HdfsClientConfigKeys class to TestHdfsConfigFields
+    #configurationClasses. (Mingliang Liu via wheat9)
+
 Release 2.7.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tools/TestHdfsConfigFields.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tools/TestHdfsConfigFields.java
index 1c029fea932..9637f59ad96 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tools/TestHdfsConfigFields.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tools/TestHdfsConfigFields.java
@@ -22,6 +22,7 @@ import java.util.HashSet;
 
 import org.apache.hadoop.conf.TestConfigurationFieldsBase;
 import org.apache.hadoop.hdfs.DFSConfigKeys;
+import org.apache.hadoop.hdfs.client.HdfsClientConfigKeys;
 
 /**
  * Unit test class to compare the following MR Configuration classes:
@@ -39,7 +40,8 @@ public class TestHdfsConfigFields extends TestConfigurationFieldsBase {
   @Override
   public void initializeMemberVariables() {
     xmlFilename = new String("hdfs-default.xml");
-    configurationClasses = new Class[] { DFSConfigKeys.class };
+    configurationClasses = new Class[] { HdfsClientConfigKeys.class,
+        DFSConfigKeys.class};
 
     // Set error modes
     errorIfMissingConfigProps = true;