diff --git a/src/Tests/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs b/src/Tests/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs
index ce6ef6e3141c..ab6228c6fe35 100644
--- a/src/Tests/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs
+++ b/src/Tests/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs
@@ -61,13 +61,13 @@ public class DotNetFirstTimeFixture : IDisposable
 
         public Dictionary<string, string> ExtraEnvironmentVariables = new Dictionary<string, string>();
 
-        public void Init(ITestOutputHelper log, TestAssetsManager testAssets)
+        public void Init(ITestOutputHelper log, TestAssetsManager testAssets, [CallerMemberName] string testName = null)
         {
             if (TestDirectory == null)
             {
                 var dotnetFirstTime = new DotNetFirstTime();
 
-                var command = dotnetFirstTime.Setup(log, testAssets, testName: "Dotnet_first_time_experience_tests");
+                var command = dotnetFirstTime.Setup(log, testAssets, testName: testName ?? "Dotnet_first_time_experience_tests");
 
                 FirstDotnetNonVerbUseCommandResult = command.Execute("--info");
                 FirstDotnetVerbUseCommandResult = command.Execute("new", "--debug:ephemeral-hive");
@@ -87,16 +87,18 @@ public void Dispose()
     public class GivenThatTheUserIsRunningDotNetForTheFirstTime : SdkTest, IClassFixture<DotNetFirstTimeFixture>
     {
         DotNetFirstTimeFixture _fixture;
+        ITestOutputHelper _log;
 
         public GivenThatTheUserIsRunningDotNetForTheFirstTime(ITestOutputHelper log, DotNetFirstTimeFixture fixture) : base(log)
         {
-            fixture.Init(log, _testAssetsManager);
+            _log = log;
             _fixture = fixture;
         }
 
         [Fact]
         public void UsingDotnetForTheFirstTimeSucceeds()
         {
+            _fixture.Init(_log, _testAssetsManager);
             _fixture.FirstDotnetVerbUseCommandResult
                 .Should()
                 .Pass();
@@ -105,6 +107,7 @@ public void UsingDotnetForTheFirstTimeSucceeds()
         [Fact]
         public void UsingDotnetForTheFirstTimeWithNonVerbsDoesNotPrintEula()
         {
+            _fixture.Init(_log, _testAssetsManager);
             string firstTimeNonVerbUseMessage = Cli.Utils.LocalizableStrings.DotNetSdkInfoLabel;
 
             _fixture.FirstDotnetNonVerbUseCommandResult.StdOut
@@ -115,7 +118,7 @@ public void UsingDotnetForTheFirstTimeWithNonVerbsDoesNotPrintEula()
         [Fact]
         public void ItShowsTheAppropriateMessageToTheUser()
         {
-
+            _fixture.Init(_log, _testAssetsManager);
             var expectedVersion = GetDotnetVersion();
             _fixture.FirstDotnetVerbUseCommandResult.StdOut
                 .Should()
@@ -130,6 +133,7 @@ public void ItShowsTheAppropriateMessageToTheUser()
         [Fact]
         public void ItCreatesAFirstUseSentinelFileUnderTheDotDotNetFolder()
         {
+            _fixture.Init(_log, _testAssetsManager);
             _fixture.DotDotnetFolder
                 .Should()
                 .HaveFile($"{GetDotnetVersion()}.dotnetFirstUseSentinel");
@@ -138,6 +142,7 @@ public void ItCreatesAFirstUseSentinelFileUnderTheDotDotNetFolder()
         [Fact]
         public void ItCreatesAnAspNetCertificateSentinelFileUnderTheDotDotNetFolder()
         {
+            _fixture.Init(_log, _testAssetsManager);
             _fixture.DotDotnetFolder
                 .Should()
                 .HaveFile($"{GetDotnetVersion()}.aspNetCertificateSentinel");