diff --git a/src/test/java/world/bentobox/challenges/ChallengesAddonTest.java b/src/test/java/world/bentobox/challenges/ChallengesAddonTest.java
index 84a3a78..9c71306 100644
--- a/src/test/java/world/bentobox/challenges/ChallengesAddonTest.java
+++ b/src/test/java/world/bentobox/challenges/ChallengesAddonTest.java
@@ -219,7 +219,7 @@ public class ChallengesAddonTest {
         new File("config.yml").delete();
         deleteAll(new File("addons"));
         deleteAll(new File("database"));
-
+        deleteAll(new File("database_backup"));
     }
 
     private void deleteAll(File file) throws IOException {
diff --git a/src/test/java/world/bentobox/challenges/ChallengesManagerTest.java b/src/test/java/world/bentobox/challenges/ChallengesManagerTest.java
index 897a800..499e5f3 100644
--- a/src/test/java/world/bentobox/challenges/ChallengesManagerTest.java
+++ b/src/test/java/world/bentobox/challenges/ChallengesManagerTest.java
@@ -196,10 +196,16 @@ public class ChallengesManagerTest {
      */
     @After
     public void tearDown() throws Exception {
-        // Clean up JSON database
-        // Clean up file system
-        if (database.exists()) {
-            Files.walk(database.toPath())
+        new File("addon.jar").delete();
+        new File("config.yml").delete();
+        deleteAll(new File("addons"));
+        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);