Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r27f3db92495948d4c1192421c1b0c20338c4a034 -r97e24856b80f612b2556fb9a599e40659710822a
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 27f3db92495948d4c1192421c1b0c20338c4a034)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 97e24856b80f612b2556fb9a599e40659710822a)
@@ -80,7 +80,6 @@
 
 
 #define DIP_MAX_CURR_WHEN_STOPPED_MA         150.0           ///< Motor controller current should not exceed this when pump should be stopped.
-#define DIP_MIN_CURR_WHEN_RUNNING_MA         150.0           ///< Motor controller current should always exceed this when pump should be running.
 #define DIP_MAX_CURR_WHEN_RUNNING_MA         2000.0          ///< Motor controller current should not exceed this when pump should be running.
 #define DIP_MAX_CURR_ERROR_DURATION_MS       2000            ///< Motor controller current errors persisting beyond this duration will trigger an alarm.
 
@@ -1172,7 +1171,7 @@
     else
     {
         dipCurr = fabs( getMeasuredDialInPumpMCCurrent() );
-        if ( ( dipCurr < DIP_MIN_CURR_WHEN_RUNNING_MA ) || ( dipCurr > DIP_MAX_CURR_WHEN_RUNNING_MA ) )
+        if ( dipCurr > DIP_MAX_CURR_WHEN_RUNNING_MA )
         {
             dipCurrErrorDurationCtr += TASK_PRIORITY_INTERVAL;
             if ( dipCurrErrorDurationCtr > DIP_MAX_CURR_ERROR_DURATION_MS )
@@ -1229,8 +1228,10 @@
     SELF_TEST_STATUS_T result = SELF_TEST_STATUS_FAILED;
     CALIBRATION_DATA_T cal;
 
+#ifndef SKIP_CALIBRATION_TESTS
     // Retrieve dialysate flow sensor calibration data
     if ( ( TRUE == getCalibrationData( &cal ) ) && ( DFM_SENSOR_PARAM_CORRUPT_STATUS != getFPGADialysateFlowMeterStatus() ) )
+#endif
     {
         dialInFlowCalGain = cal.dialysateFlowGain;
         dialInFlowCalOffset = cal.dialysateFlowOffset_mL_min;