diff --git a/Sources/SWBCore/SpecImplementations/Tools/ProductPackaging.swift b/Sources/SWBCore/SpecImplementations/Tools/ProductPackaging.swift
index 0c095dbf..5cb57d51 100644
--- a/Sources/SWBCore/SpecImplementations/Tools/ProductPackaging.swift
+++ b/Sources/SWBCore/SpecImplementations/Tools/ProductPackaging.swift
@@ -228,15 +228,9 @@ private extension ProductPackagingToolSpec {
                             .init(behavior: .note, location: entitlementsLocation, data: .init("To enable '\(buildSettingName)', remove the entitlement from your entitlements file.")),
                             .init(behavior: .note, location: .buildSettings(names: [buildSettingName]), data: .init("To disable '\(buildSettingName)', remove the entitlement from your entitlements file and disable '\(buildSettingName)' in  build settings."))
                         ]
-                    } else {
-                        message = "The '\(buildSettingName)' build setting is set to '\(buildSettingValue)', but entitlement '\(entitlement)' is set to '\(entitlementValue ? "YES" : "NO")' in your entitlements file."
-                        childDiagnostics = [
-                            .init(behavior: .note, location: .buildSettings(names: [buildSettingName]), data: .init("To enable '\(buildSettingName)', remove the entitlement from your entitlements file, and enable '\(buildSettingName)' in build settings.")),
-                            .init(behavior: .note, location: entitlementsLocation, data: .init("To disable '\(buildSettingName)', remove the entitlement from your entitlements file."))
-                        ]
-                    }
 
-                    delegate.warning(message, childDiagnostics: childDiagnostics)
+                        delegate.warning(message, childDiagnostics: childDiagnostics)
+                    }
                 }
             default:
                 break
diff --git a/Sources/SWBUniversalPlatform/Specs/ProductTypes.xcspec b/Sources/SWBUniversalPlatform/Specs/ProductTypes.xcspec
index 38336aec..0067050f 100644
--- a/Sources/SWBUniversalPlatform/Specs/ProductTypes.xcspec
+++ b/Sources/SWBUniversalPlatform/Specs/ProductTypes.xcspec
@@ -299,8 +299,6 @@
             INSTALL_PATH = "$(INSTALL_PATH_XCTRUNNER_$(USES_XCTRUNNER:default=NO))";
             INSTALL_PATH_XCTRUNNER_YES = "$(DEFAULT_TEST_RUNNER_APP_INSTALL_PATH)";
             INSTALL_PATH_XCTRUNNER_NO = "$(DEFAULT_TEST_BUNDLE_INSTALL_PATH)";
-            ENABLE_APP_SANDBOX = "$(USES_XCTRUNNER)";
-            ENABLE_OUTGOING_NETWORK_CONNECTIONS = "$(USES_XCTRUNNER)";
 
             ENTITLEMENTS_REQUIRED = NO;
 
diff --git a/Tests/SWBBuildSystemTests/EntitlementsBuildOperationTests.swift b/Tests/SWBBuildSystemTests/EntitlementsBuildOperationTests.swift
index b3e808f0..24ecc446 100644
--- a/Tests/SWBBuildSystemTests/EntitlementsBuildOperationTests.swift
+++ b/Tests/SWBBuildSystemTests/EntitlementsBuildOperationTests.swift
@@ -427,7 +427,6 @@ fileprivate struct EntitlementsBuildOperationTests: CoreBasedTests {
                 ], expectedWarnings: SWBFeatureFlag.enableAppSandboxConflictingValuesEmitsWarning.value ? [
                     "The \'ENABLE_RESOURCE_ACCESS_AUDIO_INPUT\' build setting is set to \'YES\', but entitlement \'com.apple.security.device.audio-input\' is set to \'NO\' in your entitlements file.\nTo enable \'ENABLE_RESOURCE_ACCESS_AUDIO_INPUT\', remove the entitlement from your entitlements file.\nTo disable \'ENABLE_RESOURCE_ACCESS_AUDIO_INPUT\', remove the entitlement from your entitlements file and disable \'ENABLE_RESOURCE_ACCESS_AUDIO_INPUT\' in  build settings. (in target \'App\' from project \'aProject\')",
                     "The \'ENABLE_FILE_ACCESS_MOVIES_FOLDER\' build setting is set to \'readOnly\', but entitlement \'com.apple.security.assets.movies.read-only\' is set to \'NO\' in your entitlements file.\nTo enable \'ENABLE_FILE_ACCESS_MOVIES_FOLDER\', remove the entitlement from your entitlements file.\nTo disable \'ENABLE_FILE_ACCESS_MOVIES_FOLDER\', remove the entitlement from your entitlements file and disable \'ENABLE_FILE_ACCESS_MOVIES_FOLDER\' in  build settings. (in target \'App\' from project \'aProject\')",
-                    "The \'RUNTIME_EXCEPTION_ALLOW_JIT\' build setting is set to \'NO\', but entitlement \'com.apple.security.cs.allow-jit\' is set to \'YES\' in your entitlements file.\nTo enable \'RUNTIME_EXCEPTION_ALLOW_JIT\', remove the entitlement from your entitlements file, and enable \'RUNTIME_EXCEPTION_ALLOW_JIT\' in build settings.\nTo disable \'RUNTIME_EXCEPTION_ALLOW_JIT\', remove the entitlement from your entitlements file. (in target \'App\' from project \'aProject\')"
                 ] : nil
             )
 
diff --git a/Tests/SWBTaskConstructionTests/CodeSignTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/CodeSignTaskConstructionTests.swift
index 6558b384..5ead63d3 100644
--- a/Tests/SWBTaskConstructionTests/CodeSignTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/CodeSignTaskConstructionTests.swift
@@ -832,11 +832,7 @@ fileprivate struct CodeSignTaskConstructionTests: CoreBasedTests {
 
         // When build setting and entitlement values disagree, we expect diagnostics
         try await results(action: .build, overrides: ["ENABLE_APP_SANDBOX":"NO"], appSandboxEntitlementValueOverride: true) { results in
-            results.checkWarning(
-                .equal(
-                    "The \'ENABLE_APP_SANDBOX\' build setting is set to \'NO\', but entitlement \'com.apple.security.app-sandbox\' is set to \'YES\' in your entitlements file.\nTo enable \'ENABLE_APP_SANDBOX\', remove the entitlement from your entitlements file, and enable \'ENABLE_APP_SANDBOX\' in build settings.\n/tmp/aWorkspace/aProject/Entitlements.plist: To disable \'ENABLE_APP_SANDBOX\', remove the entitlement from your entitlements file. (in target \'App\' from project \'aProject\')"
-                )
-            )
+            results.checkNoDiagnostics()
         }
     }