50 files changed, 19 insertions, 18 deletions

diff --git a/src/TestData/BasicFunctionality/BundleA/BundleA.wixproj b/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wixproj
index 45127b23..45127b23 100644
--- a/src/TestData/BasicFunctionality/BundleA/BundleA.wixproj
+++ b/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wixproj
diff --git a/src/TestData/BasicFunctionality/BundleA/BundleA.wxi b/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wxi
index 0bad694e..0bad694e 100644
--- a/src/TestData/BasicFunctionality/BundleA/BundleA.wxi
+++ b/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wxi
diff --git a/src/TestData/BasicFunctionality/BundleA/BundleA.wxs b/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wxs
index 0506f05a..0506f05a 100644
--- a/src/TestData/BasicFunctionality/BundleA/BundleA.wxs
+++ b/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wxs
diff --git a/src/TestData/BasicFunctionality/PackageA/PackageA.wixproj b/src/TestData/BasicFunctionalityTests/PackageA/PackageA.wixproj
index 9943717c..9943717c 100644
--- a/src/TestData/BasicFunctionality/PackageA/PackageA.wixproj
+++ b/src/TestData/BasicFunctionalityTests/PackageA/PackageA.wixproj
diff --git a/src/TestData/MsiTransaction/BundleAv1/BundleA.wxi b/src/TestData/MsiTransactionTests/BundleAv1/BundleA.wxi
index ef01c2e9..ef01c2e9 100644
--- a/src/TestData/MsiTransaction/BundleAv1/BundleA.wxi
+++ b/src/TestData/MsiTransactionTests/BundleAv1/BundleA.wxi
diff --git a/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wixproj b/src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj
index 4e92a102..4e92a102 100644
--- a/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wixproj
+++ b/src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj
diff --git a/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wxs b/src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wxs
index f8355aa6..f8355aa6 100644
--- a/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wxs
+++ b/src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wxs
diff --git a/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wixproj b/src/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj
index 7d1a42c5..7d1a42c5 100644
--- a/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wixproj
+++ b/src/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj
diff --git a/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wxs b/src/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wxs
index 11360c22..11360c22 100644
--- a/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wxs
+++ b/src/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wxs
diff --git a/src/TestData/MsiTransaction/BundleBv1/BundleB.wxi b/src/TestData/MsiTransactionTests/BundleBv1/BundleB.wxi
index 943b8b48..943b8b48 100644
--- a/src/TestData/MsiTransaction/BundleBv1/BundleB.wxi
+++ b/src/TestData/MsiTransactionTests/BundleBv1/BundleB.wxi
diff --git a/src/TestData/MsiTransaction/BundleBv1/BundleBv1.wixproj b/src/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wixproj
index 3cf361d2..3cf361d2 100644
--- a/src/TestData/MsiTransaction/BundleBv1/BundleBv1.wixproj
+++ b/src/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wixproj
diff --git a/src/TestData/MsiTransaction/BundleBv1/BundleBv1.wxs b/src/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wxs
index 1a24f53e..1a24f53e 100644
--- a/src/TestData/MsiTransaction/BundleBv1/BundleBv1.wxs
+++ b/src/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wxs
diff --git a/src/TestData/MsiTransaction/BundleBv2/BundleBv2.wixproj b/src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj
index 7162dea2..7162dea2 100644
--- a/src/TestData/MsiTransaction/BundleBv2/BundleBv2.wixproj
+++ b/src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj
diff --git a/src/TestData/MsiTransaction/BundleBv2/BundleBv2.wxs b/src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wxs
index 33665860..33665860 100644
--- a/src/TestData/MsiTransaction/BundleBv2/BundleBv2.wxs
+++ b/src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wxs
diff --git a/src/TestData/MsiTransaction/PackageA/PackageA.wixproj b/src/TestData/MsiTransactionTests/PackageA/PackageA.wixproj
index 2ef7c05e..2ef7c05e 100644
--- a/src/TestData/MsiTransaction/PackageA/PackageA.wixproj
+++ b/src/TestData/MsiTransactionTests/PackageA/PackageA.wixproj
diff --git a/src/TestData/MsiTransaction/PackageBv1/PackageB.props b/src/TestData/MsiTransactionTests/PackageBv1/PackageB.props
index decdfb6a..decdfb6a 100644
--- a/src/TestData/MsiTransaction/PackageBv1/PackageB.props
+++ b/src/TestData/MsiTransactionTests/PackageBv1/PackageB.props
diff --git a/src/TestData/MsiTransaction/PackageBv1/PackageBv1.wixproj b/src/TestData/MsiTransactionTests/PackageBv1/PackageBv1.wixproj
index 6dc1e4d8..6dc1e4d8 100644
--- a/src/TestData/MsiTransaction/PackageBv1/PackageBv1.wixproj
+++ b/src/TestData/MsiTransactionTests/PackageBv1/PackageBv1.wixproj
diff --git a/src/TestData/MsiTransaction/PackageBv2/PackageBv2.wixproj b/src/TestData/MsiTransactionTests/PackageBv2/PackageBv2.wixproj
index 126d0f53..126d0f53 100644
--- a/src/TestData/MsiTransaction/PackageBv2/PackageBv2.wixproj
+++ b/src/TestData/MsiTransactionTests/PackageBv2/PackageBv2.wixproj
diff --git a/src/TestData/MsiTransaction/PackageCv1/PackageC.props b/src/TestData/MsiTransactionTests/PackageCv1/PackageC.props
index b3d057bd..b3d057bd 100644
--- a/src/TestData/MsiTransaction/PackageCv1/PackageC.props
+++ b/src/TestData/MsiTransactionTests/PackageCv1/PackageC.props
diff --git a/src/TestData/MsiTransaction/PackageCv1/PackageCv1.wixproj b/src/TestData/MsiTransactionTests/PackageCv1/PackageCv1.wixproj
index 617e61c3..617e61c3 100644
--- a/src/TestData/MsiTransaction/PackageCv1/PackageCv1.wixproj
+++ b/src/TestData/MsiTransactionTests/PackageCv1/PackageCv1.wixproj
diff --git a/src/TestData/MsiTransaction/PackageCv2/PackageCv2.wixproj b/src/TestData/MsiTransactionTests/PackageCv2/PackageCv2.wixproj
index 640ad21d..640ad21d 100644
--- a/src/TestData/MsiTransaction/PackageCv2/PackageCv2.wixproj
+++ b/src/TestData/MsiTransactionTests/PackageCv2/PackageCv2.wixproj
diff --git a/src/TestData/MsiTransaction/PackageD/PackageD.wixproj b/src/TestData/MsiTransactionTests/PackageD/PackageD.wixproj
index 1df5da24..1df5da24 100644
--- a/src/TestData/MsiTransaction/PackageD/PackageD.wixproj
+++ b/src/TestData/MsiTransactionTests/PackageD/PackageD.wixproj
diff --git a/src/TestData/MsiTransaction/PackageF/PackageF.wixproj b/src/TestData/MsiTransactionTests/PackageF/PackageF.wixproj
index 46def2c5..46def2c5 100644
--- a/src/TestData/MsiTransaction/PackageF/PackageF.wixproj
+++ b/src/TestData/MsiTransactionTests/PackageF/PackageF.wixproj
diff --git a/src/TestData/PrereqBa/BundleA/BundleA.wixproj b/src/TestData/PrereqBaTests/BundleA/BundleA.wixproj
index ab4c0499..56f4b11e 100644
--- a/src/TestData/PrereqBa/BundleA/BundleA.wixproj
+++ b/src/TestData/PrereqBaTests/BundleA/BundleA.wixproj
@@ -4,7 +4,7 @@
     <OutputType>Bundle</OutputType>
   </PropertyGroup>
   <ItemGroup>
-    <BindInputPaths Include="$(OutputPath)..\net5.0-windows\win-x86" BindName="dnc5x86" />
+    <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net5.0-windows\win-x86" BindName="dnc5x86" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PackageA\PackageA.wixproj" />
diff --git a/src/TestData/PrereqBa/BundleA/BundleA.wxi b/src/TestData/PrereqBaTests/BundleA/BundleA.wxi
index 23623ffb..23623ffb 100644
--- a/src/TestData/PrereqBa/BundleA/BundleA.wxi
+++ b/src/TestData/PrereqBaTests/BundleA/BundleA.wxi
diff --git a/src/TestData/PrereqBa/BundleA/BundleA.wxs b/src/TestData/PrereqBaTests/BundleA/BundleA.wxs
index 53139834..53139834 100644
--- a/src/TestData/PrereqBa/BundleA/BundleA.wxs
+++ b/src/TestData/PrereqBaTests/BundleA/BundleA.wxs
diff --git a/src/TestData/PrereqBa/BundleA/bad.runtimeconfig.json b/src/TestData/PrereqBaTests/BundleA/bad.runtimeconfig.json
index 07a1a830..07a1a830 100644
--- a/src/TestData/PrereqBa/BundleA/bad.runtimeconfig.json
+++ b/src/TestData/PrereqBaTests/BundleA/bad.runtimeconfig.json
diff --git a/src/TestData/PrereqBa/BundleB/BundleB.wixproj b/src/TestData/PrereqBaTests/BundleB/BundleB.wixproj
index 7d4d1ebd..420c2a0c 100644
--- a/src/TestData/PrereqBa/BundleB/BundleB.wixproj
+++ b/src/TestData/PrereqBaTests/BundleB/BundleB.wixproj
@@ -4,7 +4,7 @@
     <OutputType>Bundle</OutputType>
   </PropertyGroup>
   <ItemGroup>
-    <BindInputPaths Include="$(OutputPath)..\net35\win-x86" BindName="net2x86" />
+    <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net35\win-x86" BindName="net2x86" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PackageB\PackageB.wixproj" />
diff --git a/src/TestData/PrereqBa/BundleB/BundleB.wxi b/src/TestData/PrereqBaTests/BundleB/BundleB.wxi
index 6bfeb213..6bfeb213 100644
--- a/src/TestData/PrereqBa/BundleB/BundleB.wxi
+++ b/src/TestData/PrereqBaTests/BundleB/BundleB.wxi
diff --git a/src/TestData/PrereqBa/BundleB/BundleB.wxs b/src/TestData/PrereqBaTests/BundleB/BundleB.wxs
index 57d8a552..57d8a552 100644
--- a/src/TestData/PrereqBa/BundleB/BundleB.wxs
+++ b/src/TestData/PrereqBaTests/BundleB/BundleB.wxs
diff --git a/src/TestData/PrereqBa/BundleB/bad.config b/src/TestData/PrereqBaTests/BundleB/bad.config
index 1512e59a..1512e59a 100644
--- a/src/TestData/PrereqBa/BundleB/bad.config
+++ b/src/TestData/PrereqBaTests/BundleB/bad.config
diff --git a/src/TestData/PrereqBa/PackageA/PackageA.wixproj b/src/TestData/PrereqBaTests/PackageA/PackageA.wixproj
index d46982fa..d46982fa 100644
--- a/src/TestData/PrereqBa/PackageA/PackageA.wixproj
+++ b/src/TestData/PrereqBaTests/PackageA/PackageA.wixproj
diff --git a/src/TestData/PrereqBa/PackageB/PackageB.wixproj b/src/TestData/PrereqBaTests/PackageB/PackageB.wixproj
index d5edf338..d5edf338 100644
--- a/src/TestData/PrereqBa/PackageB/PackageB.wixproj
+++ b/src/TestData/PrereqBaTests/PackageB/PackageB.wixproj
diff --git a/src/TestData/PrereqBa/PackageF/PackageF.wixproj b/src/TestData/PrereqBaTests/PackageF/PackageF.wixproj
index 3d52e939..3d52e939 100644
--- a/src/TestData/PrereqBa/PackageF/PackageF.wixproj
+++ b/src/TestData/PrereqBaTests/PackageF/PackageF.wixproj
diff --git a/src/TestData/RollbackBoundary/BundleA/BundleA.wixproj b/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wixproj
index 96f7aa31..96f7aa31 100644
--- a/src/TestData/RollbackBoundary/BundleA/BundleA.wixproj
+++ b/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wixproj
diff --git a/src/TestData/RollbackBoundary/BundleA/BundleA.wxi b/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wxi
index 145073b5..145073b5 100644
--- a/src/TestData/RollbackBoundary/BundleA/BundleA.wxi
+++ b/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wxi
diff --git a/src/TestData/RollbackBoundary/BundleA/BundleA.wxs b/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wxs
index 251b1863..251b1863 100644
--- a/src/TestData/RollbackBoundary/BundleA/BundleA.wxs
+++ b/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wxs
diff --git a/src/TestData/RollbackBoundary/PackageA/PackageA.wixproj b/src/TestData/RollbackBoundaryTests/PackageA/PackageA.wixproj
index 25d9e279..25d9e279 100644
--- a/src/TestData/RollbackBoundary/PackageA/PackageA.wixproj
+++ b/src/TestData/RollbackBoundaryTests/PackageA/PackageA.wixproj
diff --git a/src/TestData/RollbackBoundary/PackageB/PackageB.wixproj b/src/TestData/RollbackBoundaryTests/PackageB/PackageB.wixproj
index 2dc4f3a6..2dc4f3a6 100644
--- a/src/TestData/RollbackBoundary/PackageB/PackageB.wixproj
+++ b/src/TestData/RollbackBoundaryTests/PackageB/PackageB.wixproj
diff --git a/src/TestData/RollbackBoundary/PackageC/PackageC.wixproj b/src/TestData/RollbackBoundaryTests/PackageC/PackageC.wixproj
index a4b5134b..a4b5134b 100644
--- a/src/TestData/RollbackBoundary/PackageC/PackageC.wixproj
+++ b/src/TestData/RollbackBoundaryTests/PackageC/PackageC.wixproj
diff --git a/src/TestData/RollbackBoundary/PackageF/PackageF.wixproj b/src/TestData/RollbackBoundaryTests/PackageF/PackageF.wixproj
index d51fab1f..d51fab1f 100644
--- a/src/TestData/RollbackBoundary/PackageF/PackageF.wixproj
+++ b/src/TestData/RollbackBoundaryTests/PackageF/PackageF.wixproj
diff --git a/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj b/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
index 7dd1798c..4988b571 100644
--- a/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
+++ b/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
@@ -6,8 +6,8 @@
     <Cultures>en-us</Cultures>
   </PropertyGroup>
   <ItemGroup>
-    <BindInputPaths Include="$(OutputPath)..\net35\win-x86" BindName="net2x86" />
-    <BindInputPaths Include="$(OutputPath)..\net5.0-windows\win-x86" BindName="dnc5x86" />
+    <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net35\win-x86" BindName="net2x86" />
+    <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net5.0-windows\win-x86" BindName="dnc5x86" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Utilities\TestBA\TestBA.csproj" />
diff --git a/src/Wix.Build.props b/src/Wix.Build.props
index 3f3aaf8f..61fdc815 100644
--- a/src/Wix.Build.props
+++ b/src/Wix.Build.props
@@ -3,6 +3,6 @@
   <PropertyGroup>
     <TestGroupName Condition=" '$(TestGroupName)'=='' ">$([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName($(MSBuildProjectDirectory)))))</TestGroupName>
     <BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(TestGroupName)\$(ProjectName)\</BaseIntermediateOutputPath>
-    <OutputPath>$(OutputPath)$(TestGroupName)\</OutputPath>
+    <OutputPath>$(OutputPath)netcoreapp3.1\TestData\$(TestGroupName)\</OutputPath>
   </PropertyGroup>
 </Project>
diff --git a/src/WixToolsetTest.BurnE2E/BasicFunctionalityTests.cs b/src/WixToolsetTest.BurnE2E/BasicFunctionalityTests.cs
index 4982d733..edd8536b 100644
--- a/src/WixToolsetTest.BurnE2E/BasicFunctionalityTests.cs
+++ b/src/WixToolsetTest.BurnE2E/BasicFunctionalityTests.cs
@@ -9,7 +9,7 @@ namespace WixToolsetTest.BurnE2E
 
     public class BasicFunctionalityTests : BurnE2ETests
     {
-        public BasicFunctionalityTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper, "BasicFunctionality") { }
+        public BasicFunctionalityTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper) { }
 
         [Fact]
         public void CanInstallAndUninstallSimpleBundle()
diff --git a/src/WixToolsetTest.BurnE2E/BurnE2ETests.cs b/src/WixToolsetTest.BurnE2E/BurnE2ETests.cs
index 7643cc64..55353277 100644
--- a/src/WixToolsetTest.BurnE2E/BurnE2ETests.cs
+++ b/src/WixToolsetTest.BurnE2E/BurnE2ETests.cs
@@ -10,7 +10,7 @@ namespace WixToolsetTest.BurnE2E
     [Collection("BurnE2E")]
     public abstract class BurnE2ETests : WixTestBase, IDisposable
     {
-        protected BurnE2ETests(ITestOutputHelper testOutputHelper, string testGroupName) : base(testOutputHelper, testGroupName) { }
+        protected BurnE2ETests(ITestOutputHelper testOutputHelper) : base(testOutputHelper) { }
 
         private Queue<IDisposable> Installers { get; } = new Queue<IDisposable>();
 
diff --git a/src/WixToolsetTest.BurnE2E/MsiTransactionTests.cs b/src/WixToolsetTest.BurnE2E/MsiTransactionTests.cs
index 53ed1fd2..6d8f1536 100644
--- a/src/WixToolsetTest.BurnE2E/MsiTransactionTests.cs
+++ b/src/WixToolsetTest.BurnE2E/MsiTransactionTests.cs
@@ -9,7 +9,7 @@ namespace WixToolsetTest.BurnE2E
 
     public class MsiTransactionTests : BurnE2ETests
     {
-        public MsiTransactionTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper, "MsiTransaction") { }
+        public MsiTransactionTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper) { }
 
         [Fact]
         public void CanUpgradeBundleWithMsiTransaction()
diff --git a/src/WixToolsetTest.BurnE2E/PrereqBaTests.cs b/src/WixToolsetTest.BurnE2E/PrereqBaTests.cs
index c10736b1..ced2e08e 100644
--- a/src/WixToolsetTest.BurnE2E/PrereqBaTests.cs
+++ b/src/WixToolsetTest.BurnE2E/PrereqBaTests.cs
@@ -9,7 +9,7 @@ namespace WixToolsetTest.BurnE2E
 
     public class PrereqBaTests : BurnE2ETests
     {
-        public PrereqBaTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper, "PrereqBa") { }
+        public PrereqBaTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper) { }
 
         /// <summary>
         /// This bundle purposely provides a .runtimeconfig.json file that requires a version of .NET Core that doesn't exist,
diff --git a/src/WixToolsetTest.BurnE2E/RollbackBoundaryTests.cs b/src/WixToolsetTest.BurnE2E/RollbackBoundaryTests.cs
index 1ae81b49..effe4418 100644
--- a/src/WixToolsetTest.BurnE2E/RollbackBoundaryTests.cs
+++ b/src/WixToolsetTest.BurnE2E/RollbackBoundaryTests.cs
@@ -9,7 +9,7 @@ namespace WixToolsetTest.BurnE2E
 
     public class RollbackBoundaryTests : BurnE2ETests
     {
-        public RollbackBoundaryTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper, "RollbackBoundary") { }
+        public RollbackBoundaryTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper) { }
 
         /// <summary>
         /// Installs 1 bundle:
diff --git a/src/WixToolsetTest.BurnE2E/WixTestBase.cs b/src/WixToolsetTest.BurnE2E/WixTestBase.cs
index a7fd752f..650b0681 100644
--- a/src/WixToolsetTest.BurnE2E/WixTestBase.cs
+++ b/src/WixToolsetTest.BurnE2E/WixTestBase.cs
@@ -2,15 +2,13 @@
 
 namespace WixToolsetTest.BurnE2E
 {
-    using System;
-    using System.IO;
     using Xunit.Abstractions;
 
     public abstract class WixTestBase
     {
-        protected WixTestBase(ITestOutputHelper testOutputHelper, string testGroupName)
+        protected WixTestBase(ITestOutputHelper testOutputHelper)
         {
-            this.TestContext = new WixTestContext(testOutputHelper, testGroupName);
+            this.TestContext = new WixTestContext(testOutputHelper);
         }
 
         /// <summary>
diff --git a/src/WixToolsetTest.BurnE2E/WixTestContext.cs b/src/WixToolsetTest.BurnE2E/WixTestContext.cs
index 97856089..5620c6a7 100644
--- a/src/WixToolsetTest.BurnE2E/WixTestContext.cs
+++ b/src/WixToolsetTest.BurnE2E/WixTestContext.cs
@@ -4,6 +4,7 @@ namespace WixToolsetTest.BurnE2E
 {
     using System;
     using System.IO;
+    using System.Linq;
     using System.Reflection;
     using Microsoft.Win32;
     using WixBuildTools.TestSupport;
@@ -11,15 +12,17 @@ namespace WixToolsetTest.BurnE2E
 
     public class WixTestContext
     {
-        static readonly string RootDataPath = Path.GetFullPath(TestData.Get(".."));
+        static readonly string RootDataPath = Path.GetFullPath(TestData.Get("TestData"));
 
-        public WixTestContext(ITestOutputHelper testOutputHelper, string testGroupName)
+        public WixTestContext(ITestOutputHelper testOutputHelper)
         {
             var test = GetTest(testOutputHelper);
+            var splitClassName = test.TestCase.TestMethod.TestClass.Class.Name.Split('.');
 
-            this.TestDataFolder = Path.Combine(RootDataPath, testGroupName);
-            this.TestGroupName = testGroupName;
+            this.TestGroupName = splitClassName.Last();
             this.TestName = test.TestCase.TestMethod.Method.Name;
+
+            this.TestDataFolder = Path.Combine(RootDataPath, this.TestGroupName);
         }
 
         public string TestDataFolder { get; }