3 files changed, 5 insertions, 22 deletions

diff --git a/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wixproj b/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wixproj
index 96f7aa31..43a844ad 100644
--- a/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wixproj
+++ b/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wixproj
@@ -2,8 +2,13 @@
 <Project Sdk="WixToolset.Sdk">
   <PropertyGroup>
     <OutputType>Bundle</OutputType>
+    <BA>hyperlinkLicense</BA>
+    <UpgradeCode>{E8426C86-D5E4-45FA-B09D-789DC7E5E00A}</UpgradeCode>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+  </ItemGroup>
+  <ItemGroup>
     <ProjectReference Include="..\PackageA\PackageA.wixproj" />
     <ProjectReference Include="..\PackageB\PackageB.wixproj" />
     <ProjectReference Include="..\PackageC\PackageC.wixproj" />
diff --git a/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wxi b/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wxi
deleted file mode 100644
index 145073b5..00000000
--- a/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wxi
+++ /dev/null
@@ -1,21 +0,0 @@
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
-
-<?ifndef Version?>
-<?define Version = 1.0.0.0?>
-<?endif?>
-
-<Include xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
-  <Bundle Name="~$(var.TestGroupName) - Bundle A" Version="$(var.Version)" UpgradeCode="{E8426C86-D5E4-45FA-B09D-789DC7E5E00A}" Compressed="yes">
-    <Log Prefix="~$(var.TestGroupName)_BundleA" />
-
-    <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
-
-    <BootstrapperApplication>
-        <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" />
-    </BootstrapperApplication>
-
-    <Chain>
-      <PackageGroupRef Id="BundlePackages" />
-    </Chain>
-  </Bundle>
-</Include>
diff --git a/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wxs b/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wxs
index 251b1863..795dc13a 100644
--- a/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wxs
+++ b/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wxs
@@ -2,7 +2,6 @@
 
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <?include BundleA.wxi ?>
   <Fragment>
     <PackageGroup Id="BundlePackages">
       <MsiPackage Id="PackageC" SourceFile="$(var.PackageC.TargetPath)" Permanent="yes" /> <!-- TODO: this is a workaround for inability to specify RollbackBoundary as first package, remove when this is fixed -->