Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -r5adaa0ae1236d34fca1fc8def7fa107ec470115e -r695510cbdfe0cbb4d805994afc3d90e2ce2a11bc
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 5adaa0ae1236d34fca1fc8def7fa107ec470115e)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 695510cbdfe0cbb4d805994afc3d90e2ce2a11bc)
@@ -15,7 +15,8 @@
 *
 ***************************************************************************/
 
-#include "CPLD.h"
+#include "CPLD.h"
+#include "InternalADC.h"
 #include "SystemCommMessages.h"
 #include "Timers.h"
 #include "WatchdogMgmt.h"
@@ -28,9 +29,11 @@
 // ********** private definitions **********
 
 #define MIN_WATCHDOG_PET_INTERVAL_MS        45                                  ///< Minimum watchdog pet interval.
-#define WATCHDOG_POST_TIMEOUT_MS            100                                 ///< Watchdog POST timeout in ms.
+#define WATCHDOG_POST_TIMEOUT_MS            500                                 ///< Watchdog POST timeout in ms.
 #define WATCHDOG_RECOVERY_TIME_MS           250                                 ///< Watchdog recovery time in ms.
 
+#define MAX_24V_LEVEL_ON_WATCHDOG_EXPIRED   5.0                                 ///< Maximum voltage on 24V line when watchdog is expired.  // TODO - check w/ Systems.  Takes time for V to bleed off.  Had to raise to 5V.
+
 /// List of watchdog states.
 typedef enum Button_Self_Test_States
 {
@@ -163,7 +166,18 @@
             }
             if ( getCPLDWatchdogExpired() == PIN_SIGNAL_HIGH )
             {
-                watchdogSelfTestStatus = SELF_TEST_STATUS_PASSED;
+                F32 v24 = getIntADCVoltageConverted( INT_ADC_MAIN_24_VOLTS );
+
+                // Verify 24V is down when w.d. expired
+                if ( v24 > MAX_24V_LEVEL_ON_WATCHDOG_EXPIRED )
+                {
+                    SET_ALARM_WITH_2_F32_DATA( ALARM_ID_WATCHDOG_POST_TEST_FAILED, 2.0, v24 );
+                    watchdogSelfTestStatus = SELF_TEST_STATUS_FAILED;
+                }
+                else
+                {
+                    watchdogSelfTestStatus = SELF_TEST_STATUS_PASSED;
+                }
             }
             else
             {