[release/8.0] Backport test fixes#54912

wtgodbe merged 2 commits intorelease/8.0dotnet/aspnetcore:release/8.0from

mbuck/backport-54825-to-8.0dotnet/aspnetcore:mbuck/backport-54825-to-8.0Copy head branch name to clipboard