diff --git a/hoodie-common/src/test/java/com/uber/hoodie/common/model/HoodieTestUtils.java b/hoodie-common/src/test/java/com/uber/hoodie/common/model/HoodieTestUtils.java
index 6a956f27c..0fbb46cd2 100644
--- a/hoodie-common/src/test/java/com/uber/hoodie/common/model/HoodieTestUtils.java
+++ b/hoodie-common/src/test/java/com/uber/hoodie/common/model/HoodieTestUtils.java
@@ -69,7 +69,6 @@ import org.apache.hadoop.fs.LocatedFileStatus;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.RemoteIterator;
 import org.apache.hadoop.util.StringUtils;
-import org.junit.rules.TemporaryFolder;
 
 public class HoodieTestUtils {
 
@@ -83,7 +82,13 @@ public class HoodieTestUtils {
     return new Configuration();
   }
 
-  public static HoodieTableMetaClient init(Configuration hadoopConf, String basePath) throws IOException {
+  public static HoodieTableMetaClient init(String basePath)
+      throws IOException {
+    return initTableType(getDefaultHadoopConf(), basePath, HoodieTableType.COPY_ON_WRITE);
+  }
+  
+  public static HoodieTableMetaClient init(Configuration hadoopConf, String basePath)
+      throws IOException {
     return initTableType(hadoopConf, basePath, HoodieTableType.COPY_ON_WRITE);
   }
 
@@ -96,14 +101,6 @@ public class HoodieTestUtils {
     return HoodieTableMetaClient.initializePathAsHoodieDataset(hadoopConf, basePath, properties);
   }
 
-  public static HoodieTableMetaClient initOnTemp() throws IOException {
-    // Create a temp folder as the base path
-    TemporaryFolder folder = new TemporaryFolder();
-    folder.create();
-    String basePath = folder.getRoot().getAbsolutePath();
-    return HoodieTestUtils.init(HoodieTestUtils.getDefaultHadoopConf(), basePath);
-  }
-
   public static String makeNewCommitTime() {
     return new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
   }
diff --git a/hoodie-common/src/test/java/com/uber/hoodie/common/table/HoodieTableMetaClientTest.java b/hoodie-common/src/test/java/com/uber/hoodie/common/table/HoodieTableMetaClientTest.java
index 414166b99..b9c9f889b 100644
--- a/hoodie-common/src/test/java/com/uber/hoodie/common/table/HoodieTableMetaClientTest.java
+++ b/hoodie-common/src/test/java/com/uber/hoodie/common/table/HoodieTableMetaClientTest.java
@@ -35,16 +35,21 @@ import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.io.SequenceFile;
 import org.apache.hadoop.io.Text;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
 
 public class HoodieTableMetaClientTest {
 
   private HoodieTableMetaClient metaClient;
   private String basePath;
 
+  @Rule
+  public TemporaryFolder tmpFolder = new TemporaryFolder();
+  
   @Before
   public void init() throws IOException {
-    metaClient = HoodieTestUtils.initOnTemp();
+    metaClient = HoodieTestUtils.init(tmpFolder.getRoot().getAbsolutePath());
     basePath = metaClient.getBasePath();
   }
 
diff --git a/hoodie-common/src/test/java/com/uber/hoodie/common/table/string/HoodieActiveTimelineTest.java b/hoodie-common/src/test/java/com/uber/hoodie/common/table/string/HoodieActiveTimelineTest.java
index 25a6a00f4..df642490b 100644
--- a/hoodie-common/src/test/java/com/uber/hoodie/common/table/string/HoodieActiveTimelineTest.java
+++ b/hoodie-common/src/test/java/com/uber/hoodie/common/table/string/HoodieActiveTimelineTest.java
@@ -28,12 +28,11 @@ import com.uber.hoodie.common.table.timeline.HoodieInstant;
 import java.io.IOException;
 import java.util.Optional;
 import java.util.stream.Stream;
-import org.apache.hadoop.fs.Path;
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.junit.rules.TemporaryFolder;
 
 public class HoodieActiveTimelineTest {
 
@@ -41,15 +40,12 @@ public class HoodieActiveTimelineTest {
   private HoodieTableMetaClient metaClient;
   @Rule
   public final ExpectedException exception = ExpectedException.none();
-
+  @Rule
+  public TemporaryFolder tmpFolder = new TemporaryFolder();
+  
   @Before
   public void setUp() throws Exception {
-    this.metaClient = HoodieTestUtils.initOnTemp();
-  }
-
-  @After
-  public void tearDown() throws Exception {
-    metaClient.getFs().delete(new Path(this.metaClient.getBasePath()), true);
+    this.metaClient = HoodieTestUtils.init(tmpFolder.getRoot().getAbsolutePath());
   }
 
   @Test
diff --git a/hoodie-common/src/test/java/com/uber/hoodie/common/table/view/HoodieTableFileSystemViewTest.java b/hoodie-common/src/test/java/com/uber/hoodie/common/table/view/HoodieTableFileSystemViewTest.java
index f26f6d3cd..686241271 100644
--- a/hoodie-common/src/test/java/com/uber/hoodie/common/table/view/HoodieTableFileSystemViewTest.java
+++ b/hoodie-common/src/test/java/com/uber/hoodie/common/table/view/HoodieTableFileSystemViewTest.java
@@ -44,7 +44,9 @@ import java.util.stream.Collectors;
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.Path;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
 
 @SuppressWarnings("ResultOfMethodCallIgnored")
 public class HoodieTableFileSystemViewTest {
@@ -54,10 +56,13 @@ public class HoodieTableFileSystemViewTest {
   private TableFileSystemView fsView;
   private TableFileSystemView.ReadOptimizedView roView;
   private TableFileSystemView.RealtimeView rtView;
+  
+  @Rule
+  public TemporaryFolder tmpFolder = new TemporaryFolder();
 
   @Before
   public void init() throws IOException {
-    metaClient = HoodieTestUtils.initOnTemp();
+    metaClient = HoodieTestUtils.init(tmpFolder.getRoot().getAbsolutePath());;
     basePath = metaClient.getBasePath();
     fsView = new HoodieTableFileSystemView(metaClient,
         metaClient.getActiveTimeline().getCommitTimeline().filterCompletedInstants());
diff --git a/hoodie-hadoop-mr/src/test/java/com/uber/hoodie/hadoop/TestHoodieROTablePathFilter.java b/hoodie-hadoop-mr/src/test/java/com/uber/hoodie/hadoop/TestHoodieROTablePathFilter.java
index c81f9fccb..e139b7371 100644
--- a/hoodie-hadoop-mr/src/test/java/com/uber/hoodie/hadoop/TestHoodieROTablePathFilter.java
+++ b/hoodie-hadoop-mr/src/test/java/com/uber/hoodie/hadoop/TestHoodieROTablePathFilter.java
@@ -24,6 +24,8 @@ import com.uber.hoodie.common.table.HoodieTableMetaClient;
 import java.io.File;
 import java.io.IOException;
 import org.apache.hadoop.fs.Path;
+import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
@@ -32,10 +34,19 @@ import org.junit.rules.TemporaryFolder;
  */
 public class TestHoodieROTablePathFilter {
 
+  @Rule
+  public TemporaryFolder tmpFolder = new TemporaryFolder();
+  
+  private HoodieTableMetaClient metaClient;
+  
+  @Before
+  public void setUp() throws Exception {
+    this.metaClient = HoodieTestUtils.init(tmpFolder.getRoot().getAbsolutePath());
+  }
+  
   @Test
   public void testHoodiePaths() throws IOException {
     // Create a temp folder as the base path
-    HoodieTableMetaClient metaClient = HoodieTestUtils.initOnTemp();
     String basePath = metaClient.getBasePath();
 
     HoodieTestUtils.createCommitFiles(basePath, "001", "002");