diff --git a/pkg/bdd/testserver/config_test.go b/pkg/bdd/testserver/config_test.go
index 1a1deb7..5177ade 100644
--- a/pkg/bdd/testserver/config_test.go
+++ b/pkg/bdd/testserver/config_test.go
@@ -1,6 +1,7 @@
 package testserver
 
 import (
+	"os"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -11,11 +12,16 @@ func TestCreateTestConfig(t *testing.T) {
 	t.Run("DefaultConfig", func(t *testing.T) {
 		cfg := createTestConfig(9999, false)
 
+		expectedDatabaseName := os.Getenv("DLC_DATABASE_NAME")
+		if expectedDatabaseName == "" {
+			expectedDatabaseName = "dance_lessons_coach"
+		}
+
 		assert.Equal(t, "0.0.0.0", cfg.Server.Host)
 		assert.Equal(t, 9999, cfg.Server.Port)
 		assert.Equal(t, "test-secret-key-for-bdd-tests", cfg.Auth.JWTSecret)
 		assert.Equal(t, "admin123", cfg.Auth.AdminMasterPassword)
-		assert.Equal(t, "dance_lessons_coach", cfg.Database.Name)
+		assert.Equal(t, expectedDatabaseName, cfg.Database.Name)
 	})
 
 	// Test 2: Config with v2 enabled