Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -r24b2fe72608344e67ef37234085d15ad5e4fcc37 -rbd241ef5231a9869adaf7bb5ed166135beb2c0fb
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 24b2fe72608344e67ef37234085d15ad5e4fcc37)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision bd241ef5231a9869adaf7bb5ed166135beb2c0fb)
@@ -159,6 +159,7 @@
 {
     SELF_TEST_STATUS_T result = SELF_TEST_STATUS_IN_PROGRESS;
 
+#ifndef DISABLE_WD_AND_SFTY_POST_TESTS
     switch ( watchdogSelfTestState )
     {
         case WATCHDOG_SELF_TEST_STATE_START:
@@ -175,7 +176,7 @@
             {
                 F32 v24 = getIntADCVoltageConverted( INT_ADC_24V_ACTUATORS );
                 F32 audioCurrent = getFPGABackupAlarmAudioCurrent();
-
+
                 // Verify 24V is down when w.d. expired
                 if ( v24 > MAX_24V_LEVEL_ON_WATCHDOG_EXPIRED )
                 {
@@ -242,7 +243,11 @@
             result = SELF_TEST_STATUS_FAILED;
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_WATCHDOG_INVALID_SELF_TEST_STATE, watchdogSelfTestState )
             break;
-    }
+    }
+#else
+    watchdogSelfTestStatus = SELF_TEST_STATUS_PASSED;
+    result = watchdogSelfTestStatus;
+#endif
 
     return result;
 }