Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -r758497628fa5839a2b6661a9d7c32fd3b11db2bd -r1a4920a66885053a61dbc02b5d676d19a226d1f5
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 758497628fa5839a2b6661a9d7c32fd3b11db2bd)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 1a4920a66885053a61dbc02b5d676d19a226d1f5)
@@ -156,16 +156,6 @@
             postState = handlePOSTStatus( testStatus );
             break;
 
-        case POST_STATE_WATCHDOG:
-            testStatus = execWatchdogTest();
-            postState = handlePOSTStatus( testStatus );
-            break;
-
-        case POST_STATE_SAFETY_SHUTDOWN:
-            testStatus = execSafetyShutdownTest();
-            postState = handlePOSTStatus( testStatus );
-            break;
-
         // NOTE: RTC's POST must go before NVDataMgmt
         case POST_STATE_RTC:
             testStatus = execRTCSelfTest();
@@ -180,6 +170,16 @@
         // NOTE: all the actuators and sensors must execute their POST after NVDataMgmt
         // NVDataMgmt must load all the calibration data into RAM so the actuators
         // can query their corresponding calibration values successfully
+        case POST_STATE_WATCHDOG:
+            testStatus = execWatchdogTest();
+            postState = handlePOSTStatus( testStatus );
+            break;
+
+        case POST_STATE_SAFETY_SHUTDOWN:
+            testStatus = execSafetyShutdownTest();
+            postState = handlePOSTStatus( testStatus );
+            break;
+
         case POST_STATE_BLOOD_FLOW:
             testStatus = execBloodFlowTest();
             postState = handlePOSTStatus( testStatus );