2 files changed, 6 insertions, 1 deletions

diff --git a/src/test/burn/WixTestTools/BundleRegistration.cs b/src/test/burn/WixTestTools/BundleRegistration.cs
index 75660838..3541e7ea 100644
--- a/src/test/burn/WixTestTools/BundleRegistration.cs
+++ b/src/test/burn/WixTestTools/BundleRegistration.cs
@@ -66,6 +66,8 @@ namespace WixTestTools
 
         public string Publisher { get; set; }
 
+        public int? SystemComponent { get; set; }
+
         public string QuietUninstallString { get; set; }
 
         public string QuietUninstallCommand { get; set; }
@@ -125,6 +127,7 @@ namespace WixTestTools
             registration.Installed = idKey.GetValue(REGISTRY_BUNDLE_INSTALLED) as int?;
             registration.ModifyPath = idKey.GetValue(REGISTRY_BUNDLE_MODIFY_PATH) as string;
             registration.Publisher = idKey.GetValue(REGISTRY_BUNDLE_PUBLISHER) as string;
+            registration.SystemComponent = idKey.GetValue(REGISTRY_BUNDLE_SYSTEM_COMPONENT) as int?;
             registration.UrlInfoAbout = idKey.GetValue(REGISTRY_BUNDLE_URL_INFO_ABOUT) as string;
             registration.UrlUpdateInfo = idKey.GetValue(REGISTRY_BUNDLE_URL_UPDATE_INFO) as string;
 
diff --git a/src/test/burn/WixTestTools/BundleVerifier.cs b/src/test/burn/WixTestTools/BundleVerifier.cs
index e0edb081..a5dbe0ec 100644
--- a/src/test/burn/WixTestTools/BundleVerifier.cs
+++ b/src/test/burn/WixTestTools/BundleVerifier.cs
@@ -87,10 +87,12 @@ namespace WixTestTools
             }
         }
 
-        public string VerifyRegisteredAndInPackageCache()
+        public string VerifyRegisteredAndInPackageCache(int? expectedSystemComponent = null)
         {
             Assert.True(this.TryGetRegistration(out var registration));
 
+            Assert.Equal(expectedSystemComponent, registration.SystemComponent);
+
             Assert.NotNull(registration.CachePath);
             Assert.True(File.Exists(registration.CachePath));