diff --git a/message/cache_postgres.go b/message/cache_postgres.go
index ce0551c9..0146f409 100644
--- a/message/cache_postgres.go
+++ b/message/cache_postgres.go
@@ -75,7 +75,7 @@ const (
 	postgresUpdateMessageTimeQuery = `UPDATE message SET time = $1 WHERE mid = $2`
 )
 
-var pgQueries = queries{
+var postgresQueries = queries{
 	insertMessage:                    postgresInsertMessageQuery,
 	deleteMessage:                    postgresDeleteMessageQuery,
 	selectScheduledMessageIDsBySeqID: postgresSelectScheduledMessageIDsBySeqIDQuery,
@@ -106,5 +106,5 @@ func NewPostgresStore(db *sql.DB, batchSize int, batchTimeout time.Duration) (*C
 	if err := setupPostgres(db); err != nil {
 		return nil, err
 	}
-	return newCache(db, pgQueries, nil, batchSize, batchTimeout, false), nil
+	return newCache(db, postgresQueries, nil, batchSize, batchTimeout, false), nil
 }
diff --git a/server/server_test.go b/server/server_test.go
index fc85da05..24bf6cac 100644
--- a/server/server_test.go
+++ b/server/server_test.go
@@ -2999,11 +2999,10 @@ func TestServer_MessageHistoryAndStatsEndpoint(t *testing.T) {
 
 func TestServer_MessageHistoryMaxSize(t *testing.T) {
 	forEachBackend(t, func(t *testing.T, databaseURL string) {
-		t.Parallel()
+		// Do not run in parallel, we've seen race conditions with SQLite closing
 		s := newTestServer(t, newTestConfig(t, databaseURL))
 		for i := 0; i < 20; i++ {
-			s.messages = int64(i)
-			s.execManager()
+			s.updateAndWriteStats(int64(i))
 		}
 		require.Equal(t, []int64{10, 11, 12, 13, 14, 15, 16, 17, 18, 19}, s.messagesHistory)
 	})
diff --git a/webpush/store_postgres.go b/webpush/store_postgres.go
index 090a93c4..d9c61470 100644
--- a/webpush/store_postgres.go
+++ b/webpush/store_postgres.go
@@ -72,7 +72,7 @@ const (
 
 // NewPostgresStore creates a new PostgreSQL-backed web push store using an existing database connection pool.
 func NewPostgresStore(db *sql.DB) (*Store, error) {
-	if err := setupPostgresDB(db); err != nil {
+	if err := setupPostgres(db); err != nil {
 		return nil, err
 	}
 	return &Store{
@@ -95,11 +95,11 @@ func NewPostgresStore(db *sql.DB) (*Store, error) {
 	}, nil
 }
 
-func setupPostgresDB(db *sql.DB) error {
+func setupPostgres(db *sql.DB) error {
 	var schemaVersion int
 	err := db.QueryRow(postgresSelectSchemaVersionQuery).Scan(&schemaVersion)
 	if err != nil {
-		return setupNewPostgresDB(db)
+		return setupNewPostgres(db)
 	}
 	if schemaVersion > pgCurrentSchemaVersion {
 		return fmt.Errorf("unexpected schema version: version %d is higher than current version %d", schemaVersion, pgCurrentSchemaVersion)
@@ -107,7 +107,7 @@ func setupPostgresDB(db *sql.DB) error {
 	return nil
 }
 
-func setupNewPostgresDB(db *sql.DB) error {
+func setupNewPostgres(db *sql.DB) error {
 	tx, err := db.Begin()
 	if err != nil {
 		return err