Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -rf013ac5e5de456c4fa4367884cda6515f2a51642 -r9e85e7ace1390d48587174a5bc6eb11d5185cea4
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision f013ac5e5de456c4fa4367884cda6515f2a51642)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 9e85e7ace1390d48587174a5bc6eb11d5185cea4)
@@ -224,7 +224,14 @@
 
         case POST_STATE_ALARM_AUDIO:
 #ifndef DISABLE_ALARM_AUDIO
-            testStatus = execAlarmAudioSelfTest();
+            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ALARM_AUDIO ) != SW_CONFIG_ENABLE_VALUE )
+            {
+                testStatus = execAlarmAudioSelfTest();
+            }
+            else
+            {
+                testStatus = SELF_TEST_STATUS_PASSED;
+            }
 #else
             testStatus = SELF_TEST_STATUS_PASSED;
 #endif