diff --git a/testing/util.go b/testing/util.go
index 9b1f7d06d..d942f40ec 100644
--- a/testing/util.go
+++ b/testing/util.go
@@ -2,8 +2,10 @@ package testing
 
 import (
 	"context"
+	"strings"
 	"testing"
 
+	"github.com/dchest/uniuri"
 	"github.com/stretchr/testify/require"
 	"github.com/teamkeel/keel/db"
 	"github.com/teamkeel/keel/proto"
@@ -36,7 +38,7 @@ func MakeContext(t *testing.T, keelSchema string, resetDatabase bool) (context.C
 	require.NoError(t, err)
 
 	// Add database to context
-	database, err := testhelpers.SetupDatabaseForTestCase(ctx, dbConnInfo, schema, "keel_test", resetDatabase)
+	database, err := testhelpers.SetupDatabaseForTestCase(ctx, dbConnInfo, schema, "keel_test_"+strings.ToLower(uniuri.NewLen(8)), resetDatabase)
 	require.NoError(t, err)
 	ctx = db.WithDatabase(ctx, database)