diff --git a/tests/messaging/channel_test.go b/tests/messaging/channel_test.go
index 3dab0c2fb..dfaccd706 100644
--- a/tests/messaging/channel_test.go
+++ b/tests/messaging/channel_test.go
@@ -4,29 +4,17 @@ import (
 	"context"
 	"time"
 
-	"github.com/titpetric/factory"
-
 	"github.com/cortezaproject/corteza-server/messaging/repository"
 	"github.com/cortezaproject/corteza-server/messaging/types"
 	sysTypes "github.com/cortezaproject/corteza-server/system/types"
 )
 
 func (h helper) repoChannel() repository.ChannelRepository {
-	var (
-		ctx = context.Background()
-		db  = factory.Database.MustGet("messaging").With(ctx)
-	)
-
-	return repository.Channel(ctx, db)
+	return repository.Channel(context.Background(), db())
 }
 
 func (h helper) repoChMember() repository.ChannelMemberRepository {
-	var (
-		ctx = context.Background()
-		db  = factory.Database.MustGet("messaging").With(ctx)
-	)
-
-	return repository.ChannelMember(ctx, db)
+	return repository.ChannelMember(context.Background(), db())
 }
 
 func (h helper) repoMakePublicCh() *types.Channel {
diff --git a/tests/messaging/main_test.go b/tests/messaging/main_test.go
index 63d34f4f7..2cb4d53cc 100644
--- a/tests/messaging/main_test.go
+++ b/tests/messaging/main_test.go
@@ -46,6 +46,10 @@ var (
 	p   = permissions.NewTestService()
 )
 
+func db() *factory.DB {
+	return factory.Database.MustGet("messaging").With(context.Background())
+}
+
 func InitConfig() {
 	var err error
 
diff --git a/tests/messaging/message_test.go b/tests/messaging/message_test.go
index 61440f8db..48b5bb83c 100644
--- a/tests/messaging/message_test.go
+++ b/tests/messaging/message_test.go
@@ -3,28 +3,16 @@ package messaging
 import (
 	"context"
 
-	"github.com/titpetric/factory"
-
 	"github.com/cortezaproject/corteza-server/messaging/repository"
 	"github.com/cortezaproject/corteza-server/messaging/types"
 	sysTypes "github.com/cortezaproject/corteza-server/system/types"
 )
 
 func (h helper) repoMessage() repository.MessageRepository {
-	var (
-		ctx = context.Background()
-		db  = factory.Database.MustGet("messaging").With(ctx)
-	)
-
-	return repository.Message(ctx, db)
+	return repository.Message(context.Background(), db())
 }
 func (h helper) repoMessageFlag() repository.MessageFlagRepository {
-	var (
-		ctx = context.Background()
-		db  = factory.Database.MustGet("messaging").With(ctx)
-	)
-
-	return repository.MessageFlag(ctx, db)
+	return repository.MessageFlag(context.Background(), db())
 }
 
 func (h helper) repoMakeMessage(msg string, ch *types.Channel, u *sysTypes.User) *types.Message {