diff --git a/src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj b/src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj
index bcfc97c70..e0df027d5 100644
--- a/src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj
+++ b/src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj
@@ -78,7 +78,7 @@
       Properties="SourcePath=$(RestorePackagesPath);DestinationPath=$(UnpackedTarPath);PackageName=%(PackageDownload.Identity);PackageVersion=%(PackageDownload.Version)" />
 
     <!-- override PVP with bootstrap-override package versions -->
-    <Message Text="  Overriding previously-source-built package versions with $(BootstrapOverrideVersionsProps)" Importance="High" />
+    <Message Text="  Overriding previously-source-built package versions with $(BootstrapOverrideVersionsProps)" Importance="High" Condition="Exists('$(BootstrapOverrideVersionsProps)')" />
     <ReadLinesFromFile File="$(UnpackedTarPath)/PackageVersions.props">
       <Output TaskParameter="Lines" ItemName="OriginalPackageVersionLines" />
     </ReadLinesFromFile>
@@ -94,10 +94,12 @@
     <WriteLinesToFile File="$(UnpackedTarPath)/PackageVersions.props"
                       Lines="@(OriginalPackageVersionLines)"
                       Overwrite="true"
+                      Condition="Exists('$(BootstrapOverrideVersionsProps)')"
     />
     <WriteLinesToFile File="$(UnpackedTarPath)/PackageVersions.props"
                       Lines="@(BootstrapPackageVersionLines)"
                       Overwrite="false"
+                      Condition="Exists('$(BootstrapOverrideVersionsProps)')"
     />
 
     <!-- Repack tarball with new bootstrap name -->
diff --git a/test/SdkTests/TestsToSkipPortableLinux.xml b/test/SdkTests/TestsToSkipPortableLinux.xml
index f9fe2c166..734362867 100644
--- a/test/SdkTests/TestsToSkipPortableLinux.xml
+++ b/test/SdkTests/TestsToSkipPortableLinux.xml
@@ -7,5 +7,13 @@
     <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAWebApp.It_should_publish_framework_dependent_for_2x"
             Skip="true"
             Reason="https://github.com/NuGet/Home/issues/8571"/>
+
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAWebApp.PublishWebAppWithPublishProfile"
+            Skip="true"
+            Reason="https://github.com/NuGet/Home/issues/8571"/>
+
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAWebApp.It_should_publish_self_contained_for_2x"
+            Skip="true"
+            Reason="https://github.com/NuGet/Home/issues/8571"/>
   </SkippedTests>
 </Tests>