diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 04eac75cd0..366d8fb5c3 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1366,6 +1366,10 @@ Release 2.7.0 - UNRELEASED
     HDFS-7954. TestBalancer#testBalancerWithPinnedBlocks should not be executed
     on Windows.  (Xiaoyu Yao via szetszwo)
 
+    HDFS-8034. Fix
+    TestDFSClientRetries#testDFSClientConfigurationLocateFollowingBlockInitialDelay
+    for Windows. (Xiaoyu Yao via cnauroth)
+
     BREAKDOWN OF HDFS-7584 SUBTASKS AND RELATED JIRAS
 
       HDFS-7720. Quota by Storage Type API, tools and ClientNameNode
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientRetries.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientRetries.java
index 391277417a..c4258ebebe 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientRetries.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientRetries.java
@@ -1136,20 +1136,23 @@ public void testDFSClientConfigurationLocateFollowingBlockInitialDelay()
       throws Exception {
     // test if DFS_CLIENT_BLOCK_WRITE_LOCATEFOLLOWINGBLOCK_INITIAL_DELAY_KEY
     // is not configured, verify DFSClient uses the default value 400.
-    Configuration dfsConf = new HdfsConfiguration();
-    MiniDFSCluster cluster = new MiniDFSCluster.Builder(dfsConf).build();
-    cluster.waitActive();
-    NamenodeProtocols nn = cluster.getNameNodeRpc();
-    DFSClient client = new DFSClient(null, nn, dfsConf, null);
-    assertEquals(client.getConf().
-        getBlockWriteLocateFollowingInitialDelayMs(), 400);
+    MiniDFSCluster cluster = new MiniDFSCluster.Builder(conf).build();
+    try {
+      cluster.waitActive();
+      NamenodeProtocols nn = cluster.getNameNodeRpc();
+      DFSClient client = new DFSClient(null, nn, conf, null);
+      assertEquals(client.getConf().
+          getBlockWriteLocateFollowingInitialDelayMs(), 400);
 
-    // change DFS_CLIENT_BLOCK_WRITE_LOCATEFOLLOWINGBLOCK_INITIAL_DELAY_KEY,
-    // verify DFSClient uses the configured value 1000.
-    dfsConf.setInt(DFSConfigKeys.
-        DFS_CLIENT_BLOCK_WRITE_LOCATEFOLLOWINGBLOCK_INITIAL_DELAY_KEY, 1000);
-    client = new DFSClient(null, nn, dfsConf, null);
-    assertEquals(client.getConf().
-        getBlockWriteLocateFollowingInitialDelayMs(), 1000);
+      // change DFS_CLIENT_BLOCK_WRITE_LOCATEFOLLOWINGBLOCK_INITIAL_DELAY_KEY,
+      // verify DFSClient uses the configured value 1000.
+      conf.setInt(DFSConfigKeys.
+          DFS_CLIENT_BLOCK_WRITE_LOCATEFOLLOWINGBLOCK_INITIAL_DELAY_KEY, 1000);
+      client = new DFSClient(null, nn, conf, null);
+      assertEquals(client.getConf().
+          getBlockWriteLocateFollowingInitialDelayMs(), 1000);
+    } finally {
+      cluster.shutdown();
+    }
   }
 }