diff --git a/backend/v3/storage/database/repository/instance_test.go b/backend/v3/storage/database/repository/instance_test.go
index 1666e1fa1d..87933f71d0 100644
--- a/backend/v3/storage/database/repository/instance_test.go
+++ b/backend/v3/storage/database/repository/instance_test.go
@@ -341,7 +341,7 @@ func TestListInstance(t *testing.T) {
 			testFunc: func() ([]*domain.Instance, database.PoolTest, func()) {
 				ctx := context.Background()
 				// create new db to make sure no instances exist
-				pool, stop, err := newEmbeededDB()
+				pool, stop, err := newEmbeededDB(ctx)
 				require.NoError(t, err)
 
 				instanceRepo := repository.InstanceRepository(pool)
@@ -374,7 +374,7 @@ func TestListInstance(t *testing.T) {
 			testFunc: func() ([]*domain.Instance, database.PoolTest, func()) {
 				ctx := context.Background()
 				// create new db to make sure no instances exist
-				pool, stop, err := newEmbeededDB()
+				pool, stop, err := newEmbeededDB(ctx)
 				require.NoError(t, err)
 
 				instanceRepo := repository.InstanceRepository(pool)
diff --git a/backend/v3/storage/database/repository/repository.go b/backend/v3/storage/database/repository/repository.go
index 0370657b2f..8181883bdd 100644
--- a/backend/v3/storage/database/repository/repository.go
+++ b/backend/v3/storage/database/repository/repository.go
@@ -3,6 +3,5 @@ package repository
 import "github.com/zitadel/zitadel/backend/v3/storage/database"
 
 type repository struct {
-	// builder database.StatementBuilder
 	client database.QueryExecutor
 }
diff --git a/backend/v3/storage/database/repository/repository_test.go b/backend/v3/storage/database/repository/repository_test.go
index d7e463a604..f60d6a60f7 100644
--- a/backend/v3/storage/database/repository/repository_test.go
+++ b/backend/v3/storage/database/repository/repository_test.go
@@ -20,7 +20,8 @@ var pool database.PoolTest
 func runTests(m *testing.M) int {
 	var stop func()
 	var err error
-	pool, stop, err = newEmbeededDB()
+	ctx := context.Background()
+	pool, stop, err = newEmbeededDB(ctx)
 	if err != nil {
 		log.Print(err)
 		return 1
@@ -30,15 +31,13 @@ func runTests(m *testing.M) int {
 	return m.Run()
 }
 
-func newEmbeededDB() (pool database.PoolTest, stop func(), err error) {
+func newEmbeededDB(ctx context.Context) (pool database.PoolTest, stop func(), err error) {
 	var connector database.Connector
 	connector, stop, err = embedded.StartEmbedded()
 	if err != nil {
 		return nil, nil, fmt.Errorf("unable to start embedded postgres: %w", err)
 	}
 
-	ctx := context.Background()
-
 	pool_, err := connector.Connect(ctx)
 	if err != nil {
 		return nil, nil, fmt.Errorf("unable to connect to embedded postgres: %w", err)