1 files changed, 18 insertions, 0 deletions

diff --git a/src/internal/WixInternal.TestSupport/Builder.cs b/src/internal/WixInternal.TestSupport/Builder.cs
index fa6e0064..78804826 100644
--- a/src/internal/WixInternal.TestSupport/Builder.cs
+++ b/src/internal/WixInternal.TestSupport/Builder.cs
@@ -26,6 +26,11 @@ namespace WixInternal.TestSupport
 
         public string[] BuildAndQuery(Action<string[]> buildFunc, params string[] tables)
         {
+            return this.BuildAndQuery(buildFunc, validate: false, tables);
+        }
+
+        public string[] BuildAndQuery(Action<string[]> buildFunc, bool validate, params string[] tables)
+        {
             var sourceFiles = Directory.GetFiles(this.SourceFolder, "*.wxs");
             var wxlFiles = Directory.GetFiles(this.SourceFolder, "*.wxl");
 
@@ -63,6 +68,19 @@ namespace WixInternal.TestSupport
 
                 buildFunc(args.ToArray());
 
+                if (validate)
+                {
+                    args = new List<string>
+                    {
+                        "msi",
+                        "validate",
+                        "-intermediateFolder", intermediateFolder,
+                        outputPath,
+                    };
+
+                    buildFunc(args.ToArray());
+                }
+
                 return Query.QueryDatabase(outputPath, tables);
             }
         }