diff --git a/BuildAndTest.cmd b/BuildAndTest.cmd
index c93103af1..322cab42d 100644
--- a/BuildAndTest.cmd
+++ b/BuildAndTest.cmd
@@ -57,11 +57,8 @@ if "%NightlyTest%" EQU "nightly" (
 )
 
 ::Run unit tests 
-echo Run all multitargeting xunit tests
-call :RunTestProject BinaryParsers Unit || goto :ExitFailed
-call :RunTestProject BinSkim.Rules Unit || goto :ExitFailed
-call :RunTestProject BinSkim.Driver Functional || goto :ExitFailed
-call :RunTestProject BinSkim.Rules Functional  || goto :ExitFailed
+echo Run all multitargeting xunit Tests
+call :RunAllTests
 
 ::Create the BinSkim platform specific publish packages
 echo Creating Platform Specific BinSkim 'Publish' Packages
@@ -82,6 +79,20 @@ echo Exporting any BinSkim rules
 
 goto :Exit
 
+:RunAllTests
+set suceeded = 1 
+call :RunTestProject BinaryParsers Unit || set suceeded = 0
+call :RunTestProject BinSkim.Rules Unit || set suceeded = 0
+call :RunTestProject BinSkim.Driver Functional || set suceeded = 0
+call :RunTestProject BinSkim.Rules Functional || set suceeded = 0
+if "%suceeded%" NEQ "0" (
+    echo All tests executed successfully.
+) else (
+    echo Some tests failed.
+    goto :ExitFailed
+)
+Exit /B 0
+
 :RunTestProject
 set TestProject=%1
 set TestType=%2