diff --git a/pkg/bdd/suite.go b/pkg/bdd/suite.go
index f031d9f..8ee1bc6 100644
--- a/pkg/bdd/suite.go
+++ b/pkg/bdd/suite.go
@@ -42,11 +42,10 @@ func InitializeTestSuite(ctx *godog.TestSuiteContext) {
 
 	sc := ctx.ScenarioContext()
 	sc.BeforeScenario(func(s *godog.Scenario) {
-		// Get feature name from context or environment
+		// Get feature name from environment - falls back to "bdd" for multi-feature tests
 		feature := os.Getenv("FEATURE")
 		if feature == "" {
-			// Try to extract feature from scenario tags or path
-			feature = "unknown"
+			feature = "bdd"
 		}
 
 		if isCleanupLoggingEnabled() {
@@ -55,9 +54,14 @@ func InitializeTestSuite(ctx *godog.TestSuiteContext) {
 
 		// Setup schema isolation if enabled
 		if sharedServer != nil {
-			if err := sharedServer.SetupScenarioSchema(feature, s.Name); err != nil {
+			// Include scenario Uri for disambiguation when multiple features run
+			scenarioKey := s.Name
+			if s.Uri != "" {
+				scenarioKey = fmt.Sprintf("%s:%s", s.Uri, s.Name)
+			}
+			if err := sharedServer.SetupScenarioSchema(feature, scenarioKey); err != nil {
 				if isCleanupLoggingEnabled() {
-					log.Warn().Err(err).Msg("ISOLATION: Failed to setup scenario schema")
+					log.Warn().Err(err).Str("feature", feature).Str("scenario", scenarioKey).Msg("ISOLATION: Failed to setup scenario schema")
 				}
 			}
 		}
diff --git a/scripts/validate-test-suite.sh b/scripts/validate-test-suite.sh
index d0dc7f0..468da4f 100755
--- a/scripts/validate-test-suite.sh
+++ b/scripts/validate-test-suite.sh
@@ -55,6 +55,9 @@ for (( run=1; run<=$RUN_COUNT; run++ )); do
     echo "  🧪 Unit tests..."
     go clean -testcache > /dev/null 2>&1
     
+    # Set environment variables for consistent test behavior
+    export FIXED_TEST_PORT=true
+    
     set +e  # Temporarily disable exit on error
     UNIT_OUTPUT=$(go test ./cmd/... ./pkg/... -v 2>&1)
     UNIT_EXIT_CODE=$?
@@ -77,6 +80,15 @@ for (( run=1; run<=$RUN_COUNT; run++ )); do
     echo "  🧪 BDD tests..."
     go clean -testcache > /dev/null 2>&1
     
+    # Set environment variables for consistent BDD test behavior
+    export FIXED_TEST_PORT=true
+    export BDD_SCHEMA_ISOLATION=true
+    export DLC_DATABASE_HOST=localhost
+    export DLC_DATABASE_PORT=5432
+    export DLC_DATABASE_USER=postgres
+    export DLC_DATABASE_PASSWORD=postgres
+    export DLC_DATABASE_NAME=dance_lessons_coach_test
+    
     set +e  # Temporarily disable exit on error
     BDD_OUTPUT=$(go test ./features/... -v 2>&1)
     BDD_EXIT_CODE=$?
@@ -142,7 +154,7 @@ else
     # Process BDD test failures
     if [ -s "$BDD_FAILURE_LOG" ]; then
         echo "BDD Test Failures:"
-        echo "================"
+        echo "==============="
         
         # Count BDD test failures with granularity
         BDD_FAILURES=$(grep "FAIL" "$BDD_FAILURE_LOG" | \
@@ -155,7 +167,7 @@ else
             while IFS= read -r line; do
                 count=$(echo "$line" | awk '{print $1}')
                 test=$(echo "$line" | sed 's/^[0-9]*[[:space:]]*//')
-                echo "  $count × $test"
+                echo "  $count x $test"
             done <<< "$BDD_FAILURES"
         else
             echo "  None (check log for details)"
@@ -182,4 +194,4 @@ else
     echo "  5. Use ./scripts/run-bdd-tests.sh list-tags to see available tags"
     
     exit 1
-fi
\ No newline at end of file
+fi