Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r735226fefeab1dc5219d6cebee749e0c27b2ce21 -rba1f9bf09ef1c19f53cd610b3f5a8ab6b928770b
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 735226fefeab1dc5219d6cebee749e0c27b2ce21)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision ba1f9bf09ef1c19f53cd610b3f5a8ab6b928770b)
@@ -1278,12 +1278,16 @@
     CALIBRATION_DATA_T cal;
 
     // Retrieve blood flow sensor calibration data and check for sensor connected status
+#ifndef SKIP_POST
     if ( ( TRUE == getCalibrationData( &cal ) ) && ( BFM_SENSOR_PARAM_CORRUPT_STATUS != getFPGABloodFlowMeterStatus() ) )
     {
         bloodFlowCalGain = cal.bloodFlowGain;
         bloodFlowCalOffset = cal.bloodFlowOffset_mL_min;
         result = SELF_TEST_STATUS_PASSED;
     }
+#else
+    result = SELF_TEST_STATUS_PASSED;
+#endif
 
     return result;
 }
Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r27f3db92495948d4c1192421c1b0c20338c4a034 -rba1f9bf09ef1c19f53cd610b3f5a8ab6b928770b
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 27f3db92495948d4c1192421c1b0c20338c4a034)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision ba1f9bf09ef1c19f53cd610b3f5a8ab6b928770b)
@@ -1229,13 +1229,17 @@
     SELF_TEST_STATUS_T result = SELF_TEST_STATUS_FAILED;
     CALIBRATION_DATA_T cal;
 
+#ifndef SKIP_POST
     // Retrieve dialysate flow sensor calibration data
     if ( ( TRUE == getCalibrationData( &cal ) ) && ( DFM_SENSOR_PARAM_CORRUPT_STATUS != getFPGADialysateFlowMeterStatus() ) )
     {
         dialInFlowCalGain = cal.dialysateFlowGain;
         dialInFlowCalOffset = cal.dialysateFlowOffset_mL_min;
         result = SELF_TEST_STATUS_PASSED;
     }
+#else
+    result = SELF_TEST_STATUS_PASSED;
+#endif
 
     return result;
 }