diff --git a/tests/test-org-roam.el b/tests/test-org-roam.el
index 1168c89..a006483 100644
--- a/tests/test-org-roam.el
+++ b/tests/test-org-roam.el
@@ -46,19 +46,27 @@
 
 (defun org-roam-test-init ()
   "."
-  (org-roam-db--close)
   (let ((original-dir org-roam-test-directory)
         (new-dir (expand-file-name (make-temp-name "org-roam") temporary-file-directory)))
     (copy-directory original-dir new-dir)
     (setq org-roam-directory new-dir)
-    (org-roam-mode +1)))
+    (org-roam-mode +1)
+    (sleep-for 2)))
+
+(defun org-roam-test-teardown ()
+  (org-roam-mode -1)
+  (delete-file (org-roam-db--get))
+  (org-roam-db--close))
 
 ;;; Tests
 (describe "org-roam-db-build-cache"
-  (it "initializes correctly"
-    (org-roam-test-init)
-    (org-roam-db-build-cache)
+  (before-each
+    (org-roam-test-init))
 
+  (after-each
+    (org-roam-test-teardown))
+
+  (it "initializes correctly"
     ;; Cache
     (expect (caar (org-roam-db-query [:select (funcall count) :from files])) :to-be 8)
     (expect (caar (org-roam-db-query [:select (funcall count) :from links])) :to-be 5)
@@ -116,9 +124,10 @@
 
 (describe "org-roam-insert"
   (before-each
-    (org-roam-test-init)
-    (org-roam-db--clear)
-    (org-roam-db-build-cache))
+    (org-roam-test-init))
+
+  (after-each
+    (org-roam-test-teardown))
 
   (it "temp1 -> foo"
     (let ((buf (org-roam-test-find-new-file "temp1.org")))
@@ -154,9 +163,10 @@
 
 (describe "rename file updates cache"
   (before-each
-    (org-roam-test-init)
-    (org-roam-db--clear)
-    (org-roam-db-build-cache))
+    (org-roam-test-init))
+
+  (after-each
+    (org-roam-test-teardown))
 
   (it "foo -> new_foo"
     (rename-file (org-roam-test-abs-path "foo.org")
@@ -276,10 +286,10 @@
 
 (describe "delete file updates cache"
   (before-each
-    (org-roam-test-init)
-    (org-roam-db--clear)
-    (org-roam-db-build-cache)
-    (sleep-for 1))
+    (org-roam-test-init))
+
+  (after-each
+    (org-roam-test-teardown))
 
   (it "delete foo"
     (delete-file (org-roam-test-abs-path "foo.org"))