diff --git a/hudi-common/src/test/java/org/apache/hudi/common/testutils/minicluster/HdfsTestService.java b/hudi-common/src/test/java/org/apache/hudi/common/testutils/minicluster/HdfsTestService.java
index 245377e5bf313..742a595998acc 100644
--- a/hudi-common/src/test/java/org/apache/hudi/common/testutils/minicluster/HdfsTestService.java
+++ b/hudi-common/src/test/java/org/apache/hudi/common/testutils/minicluster/HdfsTestService.java
@@ -103,7 +103,9 @@ public MiniDFSCluster start(boolean format) throws IOException {
 
   public void stop() {
     LOG.info("HDFS Minicluster service being shut down.");
-    miniDfsCluster.shutdown();
+    if (miniDfsCluster != null) {
+      miniDfsCluster.shutdown();
+    }
     miniDfsCluster = null;
     hadoopConf = null;
   }