diff --git a/tests/datastore/testthreadproxyds.nim b/tests/datastore/testthreadproxyds.nim
index 10197df..528a3e7 100644
--- a/tests/datastore/testthreadproxyds.nim
+++ b/tests/datastore/testthreadproxyds.nim
@@ -38,6 +38,9 @@ suite "Test Basic ThreadDatastore with SQLite":
     taskPool = Taskpool.new(NumThreads)
     ds = ThreadDatastore.new(sqlStore, tp = taskPool).tryGet()
 
+  teardown:
+    GC_fullCollect()
+
   teardownAll:
     (await ds.close()).tryGet()
     taskPool.shutdown()
@@ -60,6 +63,8 @@ suite "Test Query ThreadDatastore with SQLite":
     ds = ThreadDatastore.new(sqlStore, tp = taskPool).tryGet()
 
   teardown:
+    GC_fullCollect()
+
     (await ds.close()).tryGet()
     taskPool.shutdown()
 
@@ -88,6 +93,9 @@ suite "Test Basic ThreadDatastore with fsds":
     taskPool = Taskpool.new(NumThreads)
     ds = ThreadDatastore.new(fsStore, withLocks = true, tp = taskPool).tryGet()
 
+  teardown:
+    GC_fullCollect()
+
   teardownAll:
     (await ds.close()).tryGet()
     taskPool.shutdown()
@@ -118,6 +126,7 @@ suite "Test Query ThreadDatastore with fsds":
     ds = ThreadDatastore.new(fsStore, withLocks = true, tp = taskPool).tryGet()
 
   teardown:
+    GC_fullCollect()
     (await ds.close()).tryGet()
     taskPool.shutdown()
 
@@ -143,6 +152,13 @@ suite "Test ThreadDatastore cancelations":
     taskPool = Taskpool.new(NumThreads)
     ds = ThreadDatastore.new(sqlStore, tp = taskPool).tryGet()
 
+  teardown:
+    GC_fullCollect()
+
+  teardownAll:
+    (await ds.close()).tryGet()
+    taskPool.shutdown()
+
   test "Should monitor signal and cancel":
     var
       signal = ThreadSignalPtr.new().tryGet()