diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMaintenanceState.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMaintenanceState.java
index bbf947fc148..f3e2a0b65ef 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMaintenanceState.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMaintenanceState.java
@@ -333,6 +333,7 @@ private void testExpectedReplication(int replicationFactor)
 
   private void testExpectedReplication(int replicationFactor,
       int expectedReplicasInRead) throws IOException {
+    setup();
     startCluster(1, 5);
 
     final Path file = new Path("/testExpectedReplication.dat");
@@ -352,6 +353,7 @@ private void testExpectedReplication(int replicationFactor,
         nodeOutofService));
 
     cleanupFile(fileSys, file);
+    teardown();
   }
 
   /**
@@ -492,6 +494,7 @@ public void testDecommissionDifferentNodeAfterMaintenances()
 
   private void testDecommissionDifferentNodeAfterMaintenance(int repl)
       throws Exception {
+    setup();
     startCluster(1, 5);
 
     final Path file =
@@ -519,6 +522,7 @@ private void testDecommissionDifferentNodeAfterMaintenance(int repl)
     assertNull(checkWithRetry(ns, fileSys, file, repl + 1, null));
 
     cleanupFile(fileSys, file);
+    teardown();
   }
 
   /**
@@ -583,6 +587,7 @@ public void testChangeReplicationFactors() throws IOException {
    */
   private void testChangeReplicationFactor(int oldFactor, int newFactor,
       int expectedLiveReplicas) throws IOException {
+    setup();
     LOG.info("Starting testChangeReplicationFactor {} {} {}",
         oldFactor, newFactor, expectedLiveReplicas);
     startCluster(1, 5);
@@ -615,6 +620,7 @@ private void testChangeReplicationFactor(int oldFactor, int newFactor,
     assertNull(checkWithRetry(ns, fileSys, file, newFactor, null));
 
     cleanupFile(fileSys, file);
+    teardown();
   }