diff --git a/cabal.project b/cabal.project
index dbf8b3c08f..0380c328c0 100644
--- a/cabal.project
+++ b/cabal.project
@@ -12,7 +12,7 @@ constraints: zip +disable-bzip2 +disable-zstd
 source-repository-package
     type: git
     location: https://github.com/simplex-chat/simplexmq.git
-    tag: a4f049d8da1021ee76fbd1b25635d16aef24154a
+    tag: 8acde0793667695c8e7ac1fdca5059075c71defa
 
 source-repository-package
     type: git
diff --git a/simplex-chat.cabal b/simplex-chat.cabal
index fd8a089193..a666fe5f11 100644
--- a/simplex-chat.cabal
+++ b/simplex-chat.cabal
@@ -34,6 +34,11 @@ flag client_postgres
   manual: True
   default: False
 
+flag server_postgres
+  description: Build server with support of PostgreSQL.
+  manual: True
+  default: False
+
 library
   exposed-modules:
       Simplex.Chat
@@ -601,6 +606,10 @@ test-suite simplex-chat-test
   else
     build-depends:
         sqlcipher-simple ==0.4.*
+  if flag(server_postgres)
+    build-depends:
+        postgresql-simple ==0.7.*
+    cpp-options: -DdbServerPostgres
   if impl(ghc >= 9.6.2)
     build-depends:
         bytestring ==0.11.*
diff --git a/tests/ChatClient.hs b/tests/ChatClient.hs
index acf7903003..af6a66d55a 100644
--- a/tests/ChatClient.hs
+++ b/tests/ChatClient.hs
@@ -57,6 +57,7 @@ import Simplex.Messaging.Protocol (srvHostnamesSMPClientVersion, sndAuthKeySMPCl
 import Simplex.Messaging.Server (runSMPServerBlocking)
 import Simplex.Messaging.Server.Env.STM (ServerConfig (..), ServerStoreCfg (..), StartOptions (..), StorePaths (..), defaultMessageExpiration, defaultIdleQueueInterval, defaultNtfExpiration, defaultInactiveClientExpiration)
 import Simplex.Messaging.Server.MsgStore.STM (STMMsgStore)
+import Simplex.Messaging.Server.MsgStore.Types
 import Simplex.Messaging.Transport
 import Simplex.Messaging.Transport.Server (ServerCredentials (..), mkTransportServerConfig)
 import Simplex.Messaging.Version
@@ -66,10 +67,9 @@ import qualified System.Terminal as C
 import System.Terminal.Internal (VirtualTerminal (..), VirtualTerminalSettings (..), withVirtualTerminal)
 import System.Timeout (timeout)
 import Test.Hspec (Expectation, HasCallStack, shouldReturn)
+
 #if defined(dbPostgres)
 import qualified Data.ByteString.Char8 as B
-import Database.PostgreSQL.Simple (ConnectInfo (..), defaultConnectInfo)
-import Simplex.Messaging.Agent.Store.Interface (DBOpts (..))
 #else
 import Data.ByteArray (ScrubbedBytes)
 import qualified Data.Map.Strict as M
@@ -78,6 +78,19 @@ import Simplex.Messaging.Agent.Store.Common (withConnection)
 import System.FilePath ((</>))
 #endif
 
+#if defined(dbServerPostgres)
+import qualified Control.Exception as E
+import Simplex.Messaging.Server.MsgStore.Postgres (PostgresMsgStore)
+import Simplex.Messaging.Server.QueueStore.Postgres.Config (PostgresStoreCfg (..))
+#endif
+
+#if defined(dbPostgres) || defined(dbServerPostgres)
+import Data.ByteString.Char8 (ByteString)
+import Database.PostgreSQL.Simple (ConnectInfo (..), defaultConnectInfo)
+import Simplex.Messaging.Agent.Store.Postgres.Options (DBOpts (..))
+import Simplex.Messaging.Agent.Store.Postgres.Util (createDBAndUserIfNotExists, dropDatabaseAndUser)
+#endif
+
 #if defined(dbPostgres)
 schemaDumpDBOpts :: DBOpts
 schemaDumpDBOpts =
@@ -99,6 +112,35 @@ testDBConnectInfo =
   }
 #endif
 
+#if defined(dbServerPostgres)
+testServerDBOpts :: DBOpts
+testServerDBOpts =
+  DBOpts
+    { connstr = testServerDBConnstr,
+      schema = "smp_server",
+      poolSize = 3,
+      createSchema = True
+    }
+
+testServerDBConnstr :: ByteString
+testServerDBConnstr = "postgresql://test_server_user@/test_server_db"
+
+testServerDBConnectInfo :: ConnectInfo
+testServerDBConnectInfo =
+  defaultConnectInfo {
+    connectUser = "test_server_user",
+    connectDatabase = "test_server_db"
+  }
+#endif
+
+#if defined(dbPostgres) || defined(dbServerPostgres)
+postgressBracket :: ConnectInfo -> IO a -> IO a
+postgressBracket connInfo =
+  E.bracket_
+    (print ("postgressBracket" <> show connInfo) >> dropDatabaseAndUser connInfo >> createDBAndUserIfNotExists connInfo)
+    (dropDatabaseAndUser connInfo)
+#endif
+
 serverPort :: ServiceName
 serverPort = "7001"
 
@@ -513,7 +555,11 @@ testChatCfg5 cfg p1 p2 p3 p4 p5 test = testChatN cfg testOpts [p1, p2, p3, p4, p
 concurrentlyN_ :: [IO a] -> IO ()
 concurrentlyN_ = mapConcurrently_ id
 
+#if defined(dbServerPostgres)
+smpServerCfg :: ServerConfig PostgresMsgStore
+#else
 smpServerCfg :: ServerConfig STMMsgStore
+#endif
 smpServerCfg =
   ServerConfig
     { transports = [(serverPort, transport @TLS, False)],
@@ -523,7 +569,11 @@ smpServerCfg =
       maxJournalStateLines = 4,
       queueIdBytes = 24,
       msgIdBytes = 6,
+#if defined(dbServerPostgres)
+      serverStoreCfg = SSCDatabase PostgresStoreCfg {dbOpts = testServerDBOpts, dbStoreLogPath = Nothing, confirmMigrations = MCYesUp, deletedTTL = 86400},
+#else
       serverStoreCfg = SSCMemory Nothing,
+#endif
       storeNtfsFile = Nothing,
       allowNewQueues = True,
       -- server password is disabled as otherwise v1 tests fail
@@ -569,7 +619,7 @@ persistentServerStoreCfg tmp = SSCMemory $ Just StorePaths {storeLogFile = tmp <
 withSmpServer :: IO () -> IO ()
 withSmpServer = withSmpServer' smpServerCfg
 
-withSmpServer' :: ServerConfig STMMsgStore -> IO a -> IO a
+withSmpServer' :: MsgStoreClass s => ServerConfig s -> IO a -> IO a
 withSmpServer' cfg = serverBracket (\started -> runSMPServerBlocking started cfg Nothing)
 
 xftpTestPort :: ServiceName
diff --git a/tests/Test.hs b/tests/Test.hs
index 46106f0654..e911dcd0d1 100644
--- a/tests/Test.hs
+++ b/tests/Test.hs
@@ -27,7 +27,6 @@ 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 System.Directory (createDirectory, removePathForcibly)
 #else
 import qualified Simplex.Messaging.TMap as TM
@@ -44,9 +43,11 @@ main = do
   agentQueryStats <- TM.emptyIO
 #endif
   withGlobalLogging logCfg . hspec
+#if defined(dbServerPostgres)
+    . aroundAll_ (postgressBracket testServerDBConnectInfo)
+#endif
 #if defined(dbPostgres)
-    . beforeAll_ (dropDatabaseAndUser testDBConnectInfo >> createDBAndUserIfNotExists testDBConnectInfo)
-    . afterAll_ (dropDatabaseAndUser testDBConnectInfo)
+    . aroundAll_ (postgressBracket testDBConnectInfo)
 #endif
     $ do
 #if defined(dbPostgres)