Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -r476ef181700cbe3182e760bcd73d978b2752212d -r85a18ee758116bb8e19b80b18f166a691a464bb7
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 476ef181700cbe3182e760bcd73d978b2752212d)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 85a18ee758116bb8e19b80b18f166a691a464bb7)
@@ -133,11 +133,6 @@
             postState = handlePOSTStatus( testStatus );
             break;
 
-        case POST_STATE_FPGA:
-            testStatus = execFPGATest();
-            postState = handlePOSTStatus( testStatus );
-            break;
-
         case POST_STATE_RTC:
             testStatus = execRTCSelfTest();
             postState = handlePOSTStatus( testStatus );
@@ -163,6 +158,11 @@
             postState = handlePOSTStatus( testStatus );
             break;
 
+        case POST_STATE_ALARM_AUDIO:
+            testStatus = execAlarmAudioSelfTest();
+            postState = handlePOSTStatus( testStatus );
+            break;
+
         case POST_STATE_ALARM_LAMP:
 #ifdef DONT_SKIP_NV_POST
             // Skip the rest of the POSTs
@@ -182,9 +182,14 @@
             postState = handlePOSTStatus( testStatus );
             break;
 
-        // Should be last POST
         case POST_STATE_STUCK_BUTTON:
             testStatus = execStuckButtonTest();
+            postState = handlePOSTStatus( testStatus );
+            break;
+
+            // Should be last POST
+        case POST_STATE_FPGA:
+            testStatus = execFPGATest();
             handlePOSTStatus( testStatus );  // Ignoring return value because last test
 
             if ( TRUE == tempPOSTPassed )