Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -rccfd15568f1e3d304320c2babb2fd4bcf0413304 -r74be223d47ea7bb0ac7d814e74d3627d830a5fac
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision ccfd15568f1e3d304320c2babb2fd4bcf0413304)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 74be223d47ea7bb0ac7d814e74d3627d830a5fac)
@@ -175,19 +175,21 @@
             {
                 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 )
                 {
                     SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_WATCHDOG_POST_TEST_FAILED, 2.0, v24 );
                     watchdogSelfTestStatus = SELF_TEST_STATUS_FAILED;
                 }
+#ifndef DISABLE_ALARM_AUDIO
                 // Verify backup alarm audio is on when w.d. expired
                 else if ( audioCurrent < MIN_BACKUP_ALARM_CURRENT_MA )
                 {
                     SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_WATCHDOG_POST_TEST_FAILED, 3.0, audioCurrent );
                     watchdogSelfTestStatus = SELF_TEST_STATUS_FAILED;
                 }
+#endif
             }
             else
             {
@@ -212,12 +214,14 @@
                         SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_WATCHDOG_POST_TEST_FAILED, 4.0, v24 );
                         watchdogSelfTestStatus = SELF_TEST_STATUS_FAILED;
                     }
+#ifndef DISABLE_ALARM_AUDIO
                     // Verify backup alarm audio is on when w.d. recovered
                     else if ( audioCurrent > MAX_BACKUP_ALARM_CURRENT_MA )
                     {
                         SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_WATCHDOG_POST_TEST_FAILED, 5.0, audioCurrent );
                         watchdogSelfTestStatus = SELF_TEST_STATUS_FAILED;
                     }
+#endif
                     else
                     {
                         watchdogSelfTestStatus = SELF_TEST_STATUS_PASSED;