Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -rdd1a9a6f5e43a5da27f4d51f56388f7d019cc43d -r15f9827c863812cfd1f891d22342103fe9a72abc
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision dd1a9a6f5e43a5da27f4d51f56388f7d019cc43d)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 15f9827c863812cfd1f891d22342103fe9a72abc)
@@ -183,14 +183,13 @@
                     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 )
+                else if ( ( audioCurrent < MIN_BACKUP_ALARM_CURRENT_MA ) &&
+                        ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ALARM_AUDIO ) != SW_CONFIG_ENABLE_VALUE ) )
                 {
                     SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_WATCHDOG_POST_TEST_FAILED, 3.0, audioCurrent );
                     watchdogSelfTestStatus = SELF_TEST_STATUS_FAILED;
                 }
-#endif
             }
             else
             {
@@ -215,14 +214,13 @@
                         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 )
+                    else if ( ( audioCurrent > MAX_BACKUP_ALARM_CURRENT_MA ) &&
+                              ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ALARM_AUDIO ) != SW_CONFIG_ENABLE_VALUE )
                     {
                         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;