Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r7a7bf19d0cf16745566956f45cef57f8eb5df445 -r6ddc5298786a4b5055f75330c49b62c6ae7adeb0
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 7a7bf19d0cf16745566956f45cef57f8eb5df445)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 6ddc5298786a4b5055f75330c49b62c6ae7adeb0)
@@ -62,6 +62,8 @@
 #define ALARM_AUDIO_CURRENT_HG_MIN_MA         20.0                                                      ///< Minimum audio current (high gain) during test tone self-test (in mA).  // TODO - Why is HG so low?  S/B same as LG I think.
 #define ALARM_AUDIO_CURRENT_LG_MIN_MA         60.0                                                      ///< Minimum audio current (low gain) during test tone self-test (in mA).
 #define ALARM_AUDIO_MAX_TEST_TIME_MS          1000                                                      ///< Maximum time for audio current to reach threshold in test.
+#define MAX_ALARM_AUDIO_VOLUME_INDEX          (MAX_ALARM_VOLUME_LEVEL - 1 )                             ///< Index for maximum alarm audio volume.
+#define MIN_ALARM_AUDIO_VOLUME_INDEX          0                                                         ///< Index for minimum alarm audio volume.
 
 /// Alarm priority ranking record.
 typedef struct
@@ -838,8 +840,8 @@
     if ( TRUE == alarmAudioTestToneRequested )
     {   // Play test tone at min volume
         setAlarmAudioState( ALARM_AUDIO_TEST_TONE,
-                            ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[0][ALARM_AUDIO_VOLUME_GAIN],
-                            ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[0][ALARM_AUDIO_VOLUME_DIVIDER] );
+                            ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[MIN_ALARM_AUDIO_VOLUME_INDEX][ALARM_AUDIO_VOLUME_GAIN],
+                            ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[MIN_ALARM_AUDIO_VOLUME_INDEX][ALARM_AUDIO_VOLUME_DIVIDER] );
         // If we're in Fault mode, ensure audio test tone request is cancelled.
         if ( MODE_FAUL == getCurrentOperationMode() )
         {