diff --git a/build.proj b/build.proj
index 79635218ff..78d82baee0 100644
--- a/build.proj
+++ b/build.proj
@@ -226,6 +226,7 @@
         --collect "Code coverage"
         --results-directory $(ResultsDirectory)
         --filter "category!=failing%26category!=flaky"
+        --blame-hang-timeout 5m
         --logger:"trx;LogFilePrefix=Unit-Windows$(TargetGroup)-$(TestSet)"
       </TestCommand>
       <TestCommand>$(TestCommand.Replace($([System.Environment]::NewLine), " "))</TestCommand>
@@ -247,6 +248,7 @@
         --collect "Code coverage"
         --results-directory $(ResultsDirectory)
         --filter "category!=failing%26category!=flaky"
+        --blame-hang-timeout 5m
         --logger:"trx;LogFilePrefix=Unit-Unixnetcoreapp-$(TestSet)"
     </TestCommand>
       <TestCommand>$(TestCommand.Replace($([System.Environment]::NewLine), " "))</TestCommand>
@@ -273,6 +275,7 @@
         --collect "Code coverage"
         --results-directory $(ResultsDirectory)
         --filter "category!=non$(TargetGroup)tests&amp;category!=failing&amp;category!=nonwindowstests"
+        --blame-hang-timeout 5m
         --logger:"trx;LogFilePrefix=Functional-Windows$(TargetGroup)-$(TestSet)"
       </TestCommand>
       <TestCommand>$(TestCommand.Replace($([System.Environment]::NewLine), " "))</TestCommand>
@@ -296,6 +299,7 @@
         --collect "Code coverage"
         --results-directory $(ResultsDirectory)
         --filter "category!=nonnetcoreapptests&amp;category!=failing&amp;category!=nonlinuxtests&amp;category!=nonuaptests"
+        --blame-hang-timeout 5m
         --logger:"trx;LogFilePrefix=Functional-Unixnetcoreapp-$(TestSet)"
       </TestCommand>
       <TestCommand>$(TestCommand.Replace($([System.Environment]::NewLine), " "))</TestCommand>
@@ -322,6 +326,7 @@
         --collect "Code coverage"
         --results-directory $(ResultsDirectory)
         --filter "category!=non$(TargetGroup)tests&amp;category!=failing&amp;category!=nonwindowstests"
+        --blame-hang-timeout 5m
         --logger:"trx;LogFilePrefix=Manual-Windows$(TargetGroup)-$(TestSet)"
       </TestCommand>
       <TestCommand>$(TestCommand.Replace($([System.Environment]::NewLine), " "))</TestCommand>
@@ -345,6 +350,7 @@
         --collect "Code coverage"
         --results-directory $(ResultsDirectory)
         --filter "category!=nonnetcoreapptests&amp;category!=failing&amp;category!=nonlinuxtests&amp;category!=nonuaptests"
+        --blame-hang-timeout 5m
         --logger:"trx;LogFilePrefix=Manual-Unixnetcoreapp-$(TestSet)"
       </TestCommand>
       <TestCommand>$(TestCommand.Replace($([System.Environment]::NewLine), " "))</TestCommand>