diff --git a/src/test/java/world/bentobox/bentobox/database/yaml/YamlDatabaseHandlerTest.java b/src/test/java/world/bentobox/bentobox/database/yaml/YamlDatabaseHandlerTest.java
index 3d13bf75b..6ed819ede 100644
--- a/src/test/java/world/bentobox/bentobox/database/yaml/YamlDatabaseHandlerTest.java
+++ b/src/test/java/world/bentobox/bentobox/database/yaml/YamlDatabaseHandlerTest.java
@@ -8,13 +8,13 @@ import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.framework;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import java.beans.IntrospectionException;
 import java.io.File;
+import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -30,7 +30,7 @@ import org.bukkit.Location;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.scheduler.BukkitScheduler;
 import org.bukkit.scheduler.BukkitTask;
-import org.junit.AfterClass;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -128,14 +128,20 @@ public class YamlDatabaseHandlerTest {
     /**
      * @throws java.lang.Exception
      */
-    @AfterClass
-    public static void tearDown() throws Exception {
-        // Clean up file system
-        Files.walk(database.toPath())
-        .sorted(Comparator.reverseOrder())
-        .map(Path::toFile)
-        .forEach(File::delete);
-        framework().clearInlineMocks();
+    @After
+    public void tearDown() throws Exception {
+        deleteAll(new File("database"));
+        deleteAll(new File("database_backup"));
+    }
+
+    private void deleteAll(File file) throws IOException {
+        if (file.exists()) {
+            Files.walk(file.toPath())
+            .sorted(Comparator.reverseOrder())
+            .map(Path::toFile)
+            .forEach(File::delete);
+        }
+
     }
 
     /**
diff --git a/src/test/java/world/bentobox/bentobox/managers/IslandDeletionManagerTest.java b/src/test/java/world/bentobox/bentobox/managers/IslandDeletionManagerTest.java
index c1eb84e0b..2eafddbf6 100644
--- a/src/test/java/world/bentobox/bentobox/managers/IslandDeletionManagerTest.java
+++ b/src/test/java/world/bentobox/bentobox/managers/IslandDeletionManagerTest.java
@@ -11,6 +11,7 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import java.io.File;
+import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Comparator;
@@ -83,7 +84,8 @@ public class IslandDeletionManagerTest {
         when(Bukkit.getScheduler()).thenReturn(scheduler);
 
         // Clear any remaining database
-        clearDatabase();
+        deleteAll(new File("database"));
+        deleteAll(new File("database_backup"));
         // Set up plugin
         plugin = mock(BentoBox.class);
         Whitebox.setInternalState(BentoBox.class, "instance", plugin);
@@ -109,17 +111,14 @@ public class IslandDeletionManagerTest {
      */
     @After
     public void tearDown() throws Exception {
-        clearDatabase();
         Mockito.framework().clearInlineMocks();
+        deleteAll(new File("database"));
+        deleteAll(new File("database_backup"));
     }
 
-
-    private void clearDatabase() throws Exception {
-        //remove any database data
-        File file = new File("database");
-        Path pathToBeDeleted = file.toPath();
+    private void deleteAll(File file) throws IOException {
         if (file.exists()) {
-            Files.walk(pathToBeDeleted)
+            Files.walk(file.toPath())
             .sorted(Comparator.reverseOrder())
             .map(Path::toFile)
             .forEach(File::delete);
diff --git a/src/test/java/world/bentobox/bentobox/managers/IslandsManagerTest.java b/src/test/java/world/bentobox/bentobox/managers/IslandsManagerTest.java
index 469eb3f8c..63e6e9639 100644
--- a/src/test/java/world/bentobox/bentobox/managers/IslandsManagerTest.java
+++ b/src/test/java/world/bentobox/bentobox/managers/IslandsManagerTest.java
@@ -332,18 +332,24 @@ public class IslandsManagerTest {
         //im.setIslandCache(islandCache);
     }
 
+    /**
+     * @throws java.lang.Exception
+     */
     @After
-    public void tearDown() throws IOException{
-        //remove any database data
-        File file = new File("database");
-        Path pathToBeDeleted = file.toPath();
+    public void tearDown() throws Exception {
+        Mockito.framework().clearInlineMocks();
+        deleteAll(new File("database"));
+        deleteAll(new File("database_backup"));
+    }
+
+    private void deleteAll(File file) throws IOException {
         if (file.exists()) {
-            Files.walk(pathToBeDeleted)
+            Files.walk(file.toPath())
             .sorted(Comparator.reverseOrder())
             .map(Path::toFile)
             .forEach(File::delete);
         }
-        Mockito.framework().clearInlineMocks();
+
     }
 
     /**
diff --git a/src/test/java/world/bentobox/bentobox/managers/PlayersManagerTest.java b/src/test/java/world/bentobox/bentobox/managers/PlayersManagerTest.java
index 31c368db0..d7a34500d 100644
--- a/src/test/java/world/bentobox/bentobox/managers/PlayersManagerTest.java
+++ b/src/test/java/world/bentobox/bentobox/managers/PlayersManagerTest.java
@@ -9,9 +9,9 @@ import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.never;
 
 import java.beans.IntrospectionException;
 import java.io.File;
@@ -226,24 +226,25 @@ public class PlayersManagerTest {
     }
 
     /**
-     * @throws java.lang.Exception - exception
+     * @throws java.lang.Exception
      */
     @After
     public void tearDown() throws Exception {
-        deleteAll(new File("database"));
         User.clearUsers();
         Mockito.framework().clearInlineMocks();
+        deleteAll(new File("database"));
+        deleteAll(new File("database_backup"));
     }
 
-    private static void deleteAll(File file) throws IOException {
+    private void deleteAll(File file) throws IOException {
         if (file.exists()) {
             Files.walk(file.toPath())
             .sorted(Comparator.reverseOrder())
             .map(Path::toFile)
             .forEach(File::delete);
         }
-    }
 
+    }
     /**
      * Test method for {@link world.bentobox.bentobox.managers.PlayersManager#PlayersManager(world.bentobox.bentobox.BentoBox)}.
      */