Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -r91aa11a47f3b3c744cbbfd9e9c1bd240263aa1bd -rab57180655892575252175a4310d97a1c8c46e74
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 91aa11a47f3b3c744cbbfd9e9c1bd240263aa1bd)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision ab57180655892575252175a4310d97a1c8c46e74)
@@ -23,6 +23,7 @@
 #include "CPLD.h"
 #include "DialInFlow.h"
 #include "FPGA.h"
+#include "Integrity.h"
 #include "ModeInitPOST.h"
 #include "NVDataMgmt.h"
 #include "OperationModes.h"
@@ -133,7 +134,8 @@
             break;
 
         case POST_STATE_FW_INTEGRITY:
-            postState = POST_STATE_WATCHDOG;
+            testStatus = execIntegrityTest();
+            postState = handlePOSTStatus( testStatus );
             break;
 
         case POST_STATE_WATCHDOG:
@@ -235,7 +237,6 @@
             // Should not get here - any failed post test should have already triggered a fault and taken us to fault mode
         default:
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_MODE_INIT_POST_INVALID_POST_STATE, postState )
-            postState = POST_STATE_FAILED;
             break;
     }