1 files changed, 14 insertions, 1 deletions

diff --git a/src/internal/WixInternal.TestSupport/Builder.cs b/src/internal/WixInternal.TestSupport/Builder.cs
index 51b7bb0a..eec51797 100644
--- a/src/internal/WixInternal.TestSupport/Builder.cs
+++ b/src/internal/WixInternal.TestSupport/Builder.cs
@@ -100,7 +100,7 @@ namespace WixInternal.TestSupport
             }
         }
 
-        public void BuildAndDecompileAndBuild(Action<string[]> buildFunc, Action<string[]> decompileFunc, string decompilePath)
+        public void BuildAndDecompileAndBuild(Action<string[]> buildFunc, Action<string[]> decompileFunc, string decompilePath, bool validate = false)
         {
             var sourceFiles = Directory.GetFiles(this.SourceFolder, "*.wxs");
             var wxlFiles = Directory.GetFiles(this.SourceFolder, "*.wxl");
@@ -145,6 +145,19 @@ namespace WixInternal.TestSupport
 
                 buildFunc(firstBuildArgs.ToArray());
 
+                if (validate)
+                {
+                    firstBuildArgs = new List<string>
+                    {
+                        "msi",
+                        "validate",
+                        "-intermediateFolder", intermediateFolder,
+                        outputPath,
+                    };
+
+                    buildFunc(firstBuildArgs.ToArray());
+                }
+
                 // Decompile built output.
                 var decompileArgs = new List<string>
                 {