Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -rdaefaef0d2d3e13ff563f11d9721ccc1d831cf06 -rd6c75118f4e5792b40b744a0b29e44c78368a469
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision daefaef0d2d3e13ff563f11d9721ccc1d831cf06)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision d6c75118f4e5792b40b744a0b29e44c78368a469)
@@ -1231,13 +1231,17 @@
     // Get the flow sensors calibration record
     HD_FLOW_SENSORS_CAL_RECORD_T cal = getHDFlowSensorsCalibrationRecord();
 
+#ifndef SKIP_CALIBRATION_TESTS
     // Retrieve dialysate flow sensor calibration data
     if (  DFM_SENSOR_PARAM_CORRUPT_STATUS != getFPGADialysateFlowMeterStatus() )
     {
         dialInFlowCalGain   = cal.hdFlowSensors[ CAL_DATA_HD_DIALYZER_FLOW_SENSOR ].gain;
         dialInFlowCalOffset = cal.hdFlowSensors[ CAL_DATA_HD_DIALYZER_FLOW_SENSOR ].offset;
         result = SELF_TEST_STATUS_PASSED;
     }
+#else
+    result = SELF_TEST_STATUS_PASSED;
+#endif
 
     return result;
 }