Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -r2bdd010a62ea113058640fc1e9c763dcf885c93c -rd6c75118f4e5792b40b744a0b29e44c78368a469
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 2bdd010a62ea113058640fc1e9c763dcf885c93c)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision d6c75118f4e5792b40b744a0b29e44c78368a469)
@@ -103,8 +103,12 @@
         case POST_STATE_START:
             postState = POST_STATE_WATCHDOG;
 #ifdef SKIP_POST
-            postState = POST_STATE_VALVES;
+            postState = POST_STATE_COMPLETED;
 #endif
+#ifdef DONT_SKIP_NV_POST
+            // Only run NVDataMgmt POST
+            postState = POST_STATE_NVDATAMGMT;
+#endif
             break;
 
         case POST_STATE_WATCHDOG:
@@ -128,8 +132,13 @@
             break;
 
         case POST_STATE_BLOOD_FLOW:
+#ifdef DONT_SKIP_NV_POST
+            // Skip the rest of the POSTs
+            postState = POST_STATE_COMPLETED;
+#else
             testStatus = execBloodFlowTest();
             postState = handlePOSTStatus( testStatus );
+#endif
             break;
 
         case POST_STATE_DIALYSATE_FLOW: