diff --git a/.azure/pipelines/e2e-tests.yml b/.azure/pipelines/e2e-tests.yml
index 3db5a15233..18398083cf 100644
--- a/.azure/pipelines/e2e-tests.yml
+++ b/.azure/pipelines/e2e-tests.yml
@@ -19,10 +19,7 @@ phases:
     inputs:
       versionSpec: 10.x
   - powershell: |
-      test/Cli.FunctionalTests/run-tests.ps1 `
-        -ci `
-        -ProdConManifestUrl $env:PRODCONMANIFESTURL `
-        -TestRuntimeIdentifier $(Test.RuntimeIdentifier)
+      test/Cli.FunctionalTests/run-tests.ps1 -ci -ProdConManifestUrl $env:PRODCONMANIFESTURL -TestRuntimeIdentifier $(Test.RuntimeIdentifier)
     condition: ne(variables['PB_SkipTests'], 'true')
     displayName: Run E2E tests
   - task: PublishTestResults@2
diff --git a/test/Cli.FunctionalTests/run-tests.ps1 b/test/Cli.FunctionalTests/run-tests.ps1
index 5c04f369f9..2c0f77cff8 100644
--- a/test/Cli.FunctionalTests/run-tests.ps1
+++ b/test/Cli.FunctionalTests/run-tests.ps1
@@ -49,6 +49,9 @@ Set-StrictMode -Version 1
 $repoRoot = Resolve-Path "$PSScriptRoot/../../"
 Import-Module "$repoRoot/scripts/common.psm1" -Scope Local -Force
 
+# This ID corresponds to the ProdCon build number
+Write-Host "ProductBuildId:  $env:PRODUCTBUILDID"
+
 if (-not $HostRid) {
     if (Test-Path Variable:/IsCoreCLR) {
         $HostRid = if ($IsWindows) { 'win-x64' } `
@@ -89,6 +92,8 @@ try {
             $ProdConManifestUrl = "https://raw.githubusercontent.com/dotnet/versions/master/build-info/dotnet/product/cli/$ProcConChannel/build.xml"
         }
 
+        Write-Host "ProdConManifestUrl:    $ProdConManifestUrl"
+
         [xml] $prodConManifest = Invoke-RestMethod $ProdConManifestUrl
 
         $RestoreSources = $prodConManifest.OrchestratedBuild.Endpoint `
@@ -106,7 +111,9 @@ try {
             Write-Error "Missing required parameter: AssetRootUrl"
         }
         $AssetRootUrl = $AssetRootUrl.TrimEnd('/')
-        [xml] $cli = Invoke-RestMethod "$AssetRootUrl/orchestration-metadata/manifests/cli.xml${AccessTokenSuffix}"
+        $cliMetadataUrl = "$AssetRootUrl/orchestration-metadata/manifests/cli.xml${AccessTokenSuffix}"
+        Write-Host "CliMetadataUrl:    $cliMetadataUrl"
+        [xml] $cli = Invoke-RestMethod $cliMetadataUrl
         $sdkVersion = $cli.Build.ProductVersion
     }