diff --git a/test/dotnet.Tests/MSBuild.exe b/test/dotnet.Tests/MSBuild.exe
index 2b4d0f999..9bda258ef 100644
--- a/test/dotnet.Tests/MSBuild.exe
+++ b/test/dotnet.Tests/MSBuild.exe
@@ -1 +1 @@
-https://github.com/Microsoft/msbuild/issues/927
\ No newline at end of file
+https://github.com/Microsoft/msbuild/issues/927
diff --git a/test/dotnet.Tests/MSBuild.exe.config b/test/dotnet.Tests/MSBuild.exe.config
index 2b4d0f999..9bda258ef 100644
--- a/test/dotnet.Tests/MSBuild.exe.config
+++ b/test/dotnet.Tests/MSBuild.exe.config
@@ -1 +1 @@
-https://github.com/Microsoft/msbuild/issues/927
\ No newline at end of file
+https://github.com/Microsoft/msbuild/issues/927
diff --git a/test/dotnet.Tests/PackagedCommandTests.cs b/test/dotnet.Tests/PackagedCommandTests.cs
index 441eba5be..236a30096 100644
--- a/test/dotnet.Tests/PackagedCommandTests.cs
+++ b/test/dotnet.Tests/PackagedCommandTests.cs
@@ -152,7 +152,9 @@ namespace Microsoft.DotNet.Tests
             var toolWithRandPkgNameDir = testInstance.Root.Sub("ToolWithRandomPackageName");
             var pkgsDir = testInstance.Root.CreateSubdirectory("pkgs");
 
-            string randomPackageName = Guid.NewGuid().ToString();
+            // 3ebdd4f1-a194-470a-b01a-4515672791d1
+            //                         ^-- index = 24
+            string randomPackageName = Guid.NewGuid().ToString().Substring(24);
 
             // TODO: This is a workround for https://github.com/dotnet/cli/issues/5020
             SetGeneratedPackageName(appWithDepOnToolDir.GetFile("AppWithDepOnTool.csproj"),
@@ -163,21 +165,18 @@ namespace Microsoft.DotNet.Tests
 
             new RestoreCommand()
                 .WithWorkingDirectory(toolWithRandPkgNameDir)
-                .ExecuteWithCapturedOutput()
-                .Should().Pass()
-                .And.NotHaveStdErr();
+                .Execute()
+                .Should().Pass();
 
             new PackCommand()
                 .WithWorkingDirectory(toolWithRandPkgNameDir)
-                .ExecuteWithCapturedOutput($"-o \"{pkgsDir.FullName}\"")
-                .Should().Pass()
-                .And.NotHaveStdErr();
+                .Execute($"-o \"{pkgsDir.FullName}\"")
+                .Should().Pass();
 
             new RestoreCommand()
                 .WithWorkingDirectory(appWithDepOnToolDir)
-                .ExecuteWithCapturedOutput($"--packages \"{pkgsDir.FullName}\"")
-                .Should().Pass()
-                .And.NotHaveStdErr();
+                .Execute($"--packages \"{pkgsDir.FullName}\"")
+                .Should().Pass();
 
             new TestCommand("dotnet")
                 .WithWorkingDirectory(appWithDepOnToolDir)