diff --git a/build/scripts/build.ps1 b/build/scripts/build.ps1
index 4805be960224a73c53e9a2c1913a604cab5b4ab4..7be8345221d7c65672ba10e3722d8bf2c5bffaea 100644
--- a/build/scripts/build.ps1
+++ b/build/scripts/build.ps1
@@ -29,6 +29,7 @@ param (
     [switch]$packAll = $false,
     [switch]$binaryLog = $false,
     [switch]$deployExtensions = $false,
+    [switch]$procdump = $false,
     [string]$signType = "",
     [switch]$skipBuildExtras = $false,
     [switch]$skipAnalyzers = $false,
@@ -63,6 +64,7 @@ function Print-Usage() {
     Write-Host "  -pack                     Create our NuGet packages"
     Write-Host "  -deployExtensions         Deploy built vsixes"
     Write-Host "  -binaryLog                Create binary log for every MSBuild invocation"
+    Write-Host "  -procdump                 Monitor test runs with procdump" 
     Write-Host "  -skipAnalyzers            Do not run analyzers during build operations"
     Write-Host "  -skipBuildExtras          Do not build insertion items"
     Write-Host "" 
@@ -548,7 +550,9 @@ function Test-XUnit() {
     if ($cibuild -or $official) {
         # Use a 50 minute timeout on CI
         $args += " -xml -timeout:50"
+    }
 
+    if ($procdump) {
         $procdumpPath = Ensure-ProcDump
         $args += " -procdumppath:$procDumpPath"
     }
diff --git a/netci.groovy b/netci.groovy
index e546387d7e5e9c8faeac9821abb9b04b04d2c586..f01d26aa96c860511675252d206f08cd50b52376 100644
--- a/netci.groovy
+++ b/netci.groovy
@@ -67,7 +67,7 @@ commitPullList.each { isPr ->
         def myJob = job(jobName) {
             description("Windows ${configuration} tests on ${buildTarget}")
                   steps {
-                    batchFile(""".\\build\\scripts\\cibuild.cmd ${(configuration == 'debug') ? '-debug' : '-release'} ${(buildTarget == 'unit32') ? '-test32' : '-test64'} -testDesktop""")
+                    batchFile(""".\\build\\scripts\\cibuild.cmd ${(configuration == 'debug') ? '-debug' : '-release'} ${(buildTarget == 'unit32') ? '-test32' : '-test64'} -procdump -testDesktop""")
                   }
         }
 
@@ -223,7 +223,7 @@ commitPullList.each { isPr ->
       def myJob = job(jobName) {
         description("Windows ${configuration} tests on ${buildTarget}")
         steps {
-          batchFile(""".\\build\\scripts\\cibuild.cmd -${configuration} -testVsi""")
+          batchFile(""".\\build\\scripts\\cibuild.cmd -${configuration} -procdump -testVsi""")
         }
       }