Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -r93156ec3080112357d4cd115ab2e9a23c6ab152d -r35fe4d0c83b0e91fff7234be20bd4ef1756e62a3
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 93156ec3080112357d4cd115ab2e9a23c6ab152d)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 35fe4d0c83b0e91fff7234be20bd4ef1756e62a3)
@@ -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 );
@@ -182,9 +177,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 )