diff --git a/eng/build.yml b/eng/build.yml
index d13162be43e3..0d492b54db74 100644
--- a/eng/build.yml
+++ b/eng/build.yml
@@ -190,6 +190,7 @@ jobs:
            log/$(_BuildConfig)/**/*	
            TestResults/$(_BuildConfig)/**/*	
            SymStore/$(_BuildConfig)/**/*
+           tmp/$(_BuildConfig)/**/*.binlog
           TargetFolder: '$(Build.ArtifactStagingDirectory)'	
         continueOnError: true	
         condition: always()
@@ -321,6 +322,7 @@ jobs:
               log/$(_BuildConfig)/**/*	
               TestResults/$(_BuildConfig)/**/*	
               SymStore/$(_BuildConfig)/**/*
+              tmp/$(_BuildConfig)/**/*.binlog
             TargetFolder: '$(Build.ArtifactStagingDirectory)'	
           continueOnError: true	
           condition: always()
@@ -463,6 +465,7 @@ jobs:
            log/$(_BuildConfig)/**/*	
            TestResults/$(_BuildConfig)/**/*	
            SymStore/$(_BuildConfig)/**/*
+           tmp/$(_BuildConfig)/**/*.binlog
           TargetFolder: '$(Build.ArtifactStagingDirectory)'	
         continueOnError: true	
         condition: always()
diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeHaveAPackageReferenceWithAliases.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeHaveAPackageReferenceWithAliases.cs
index 474bab3ad652..1d2114cbe0ab 100644
--- a/test/Microsoft.NET.Build.Tests/GivenThatWeHaveAPackageReferenceWithAliases.cs
+++ b/test/Microsoft.NET.Build.Tests/GivenThatWeHaveAPackageReferenceWithAliases.cs
@@ -11,11 +11,11 @@ public class GivenThatWeHaveAPackageReferenceWithAliases : SdkTest
         public GivenThatWeHaveAPackageReferenceWithAliases(ITestOutputHelper log) : base(log)
         { }
 
-        [RequiresMSBuildVersionFact("16.8.0")]
+        [RequiresMSBuildVersionFact("16.8.0", Skip = "https://github.com/dotnet/sdk/issues/39172")]
         public void CanBuildProjectWithPackageReferencesWithConflictingTypes()
         {
             var targetFramework = ToolsetInfo.CurrentTargetFramework;
-            var packageReferences = GetPackageReferencesWithConflictingTypes(targetFramework, packageNames: new string[] { "A", "B" });
+            var packageReferences = GetPackageReferencesWithConflictingTypes(targetFramework, packageNames: new string[] { "ConflictingA", "ConflictingB" });
 
             TestProject testProject = new()
             {
@@ -43,13 +43,14 @@ public void CanBuildProjectWithPackageReferencesWithConflictingTypes()
             sources.AddRange(packagesPaths);
             NuGetConfigWriter.Write(testAsset.TestRoot, sources);
 
-            var buildCommand = new BuildCommand(testAsset);
-            buildCommand.Execute()
+            var buildCommand = new BuildCommand(testAsset)
+                .WithWorkingDirectory(testAsset.Path);
+            buildCommand.Execute("-bl")
                 .Should()
                 .Pass();
         }
 
-        [RequiresMSBuildVersionFact("16.8.0", Skip = "https://github.com/dotnet/sdk/issues/38268")]
+        [RequiresMSBuildVersionFact("16.8.0", Skip = "https://github.com/dotnet/sdk/issues/39172")]
         public void CanBuildProjectWithMultiplePackageReferencesWithAliases()
         {
             var targetFramework = ToolsetInfo.CurrentTargetFramework;
@@ -87,18 +88,19 @@ public void CanBuildProjectWithMultiplePackageReferencesWithAliases()
             List<string> sources = new() { NuGetConfigWriter.DotnetCoreBlobFeed, Path.GetDirectoryName(packageReferenceA.NupkgPath), Path.GetDirectoryName(packageReferenceB.NupkgPath) };
             NuGetConfigWriter.Write(testAsset.TestRoot, sources);
 
-            var buildCommand = new BuildCommand(testAsset);
-            buildCommand.Execute()
+            var buildCommand = new BuildCommand(testAsset)
+                .WithWorkingDirectory(testAsset.Path);
+            buildCommand.Execute("-bl")
                 .Should()
                 .Pass();
         }
 
-        [RequiresMSBuildVersionFact("16.8.0")]
+        [RequiresMSBuildVersionFact("16.8.0", Skip = "https://github.com/dotnet/sdk/issues/39172")]
         public void CanBuildProjectWithAPackageReferenceWithMultipleAliases()
         {
             var targetFramework = ToolsetInfo.CurrentTargetFramework;
 
-            var packageReferenceA = GetPackageReference(targetFramework, "A", ClassLibMultipleClasses);
+            var packageReferenceA = GetPackageReference(targetFramework, "MultipleClasses", ClassLibMultipleClasses);
 
             TestProject testProject = new()
             {
@@ -123,8 +125,9 @@ public void CanBuildProjectWithAPackageReferenceWithMultipleAliases()
             List<string> sources = new() { NuGetConfigWriter.DotnetCoreBlobFeed, Path.GetDirectoryName(packageReferenceA.NupkgPath) };
             NuGetConfigWriter.Write(testAsset.TestRoot, sources);
 
-            var buildCommand = new BuildCommand(testAsset);
-            buildCommand.Execute()
+            var buildCommand = new BuildCommand(testAsset)
+                .WithWorkingDirectory(testAsset.Path);            
+            buildCommand.Execute("-bl")
                 .Should()
                 .Pass();
         }