Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -r5e595c58d494cfd452a8a9e89aec3bb8def793e2 -r1154e93c2fddd59e81f4a07230c13e0d889ffdf1
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 5e595c58d494cfd452a8a9e89aec3bb8def793e2)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 1154e93c2fddd59e81f4a07230c13e0d889ffdf1)
@@ -94,8 +94,11 @@
             postState = DG_POST_STATE_FPGA;
 #ifdef SKIP_POST
             postState = DG_POST_STATE_COMPLETED;
-            postState = DG_POST_STATE_RTC;
 #endif
+#ifdef DONT_SKIP_NV_POST
+            // Only run NVDataMgmt POST
+            postState = DG_POST_STATE_NVDATAMGMT;
+#endif
             break;
 
         case DG_POST_STATE_FPGA:
@@ -111,11 +114,17 @@
         case DG_POST_STATE_NVDATAMGMT:
             testStatus = execNVDataMgmtSelfTest();
             postState = handlePOSTStatus( testStatus );
+
             break;
 
         case DG_POST_STATE_TEMPERATURE_SENSORS:
+#ifdef DONT_SKIP_NV_POST
+            // Skip the rest of the POSTs
+            postState = DG_POST_STATE_COMPLETED;
+#else
             testStatus = execTemperatureSensorsSelfTest();
             postState = handlePOSTStatus( testStatus );
+#endif
             break;
 
         case DG_POST_STATE_HEATERS: