diff --git a/tests/Test.hs b/tests/Test.hs
index 253a535370..e4e76fd43e 100644
--- a/tests/Test.hs
+++ b/tests/Test.hs
@@ -26,7 +26,7 @@ import ViewTests
 import Control.Exception (bracket_)
 import PostgresSchemaDump
 import Simplex.Chat.Store.Postgres.Migrations (migrations)
-import Simplex.Messaging.Agent.Store.Postgres.Util (createDBAndUserIfNotExists, dropAllSchemasExceptSystem, dropDatabaseAndUser)
+import Simplex.Messaging.Agent.Store.Postgres.Util (createDBAndUserIfNotExists, dropDatabaseAndUser)
 import System.Directory (createDirectoryIfMissing, removePathForcibly)
 #else
 import APIDocs
@@ -44,13 +44,9 @@ main = do
   agentQueryStats <- TM.emptyIO
 #endif
   withGlobalLogging logCfg . hspec
-#if defined(dbPostgres)
-    . before_ (dropDatabaseAndUser testDBConnectInfo >> createDBAndUserIfNotExists testDBConnectInfo)
-    . after_ (dropDatabaseAndUser testDBConnectInfo)
-#endif
     $ do
 #if defined(dbPostgres)
-      around_ (bracket_ (createDirectoryIfMissing False "tests/tmp") (removePathForcibly "tests/tmp")) $
+      createdDropDb . around_ (bracket_ (createDirectoryIfMissing False "tests/tmp") (removePathForcibly "tests/tmp")) $
         describe "Postgres schema dump" $
           postgresSchemaDumpTest
             migrations
@@ -70,7 +66,7 @@ main = do
       describe "Operators" operatorTests
       describe "Random servers" randomServersTests
 #if defined(dbPostgres)
-      around testBracket
+      createdDropDb . around testBracket
 #else
       around (testBracket chatQueryStats agentQueryStats)
 #endif
@@ -87,6 +83,9 @@ main = do
 #endif
   where
 #if defined(dbPostgres)
+    createdDropDb =
+      before_ (dropDatabaseAndUser testDBConnectInfo >> createDBAndUserIfNotExists testDBConnectInfo)
+        . after_ (dropDatabaseAndUser testDBConnectInfo)
     testBracket test = withSmpServer $ tmpBracket $ \tmpPath -> test TestParams {tmpPath, printOutput = False}
 #else
     testBracket chatQueryStats agentQueryStats test =