Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -rba1f9bf09ef1c19f53cd610b3f5a8ab6b928770b -r85a680de4306aa033b1dc1f386fa5fa0a25cf73b
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision ba1f9bf09ef1c19f53cd610b3f5a8ab6b928770b)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 85a680de4306aa033b1dc1f386fa5fa0a25cf73b)
@@ -1278,7 +1278,7 @@
     CALIBRATION_DATA_T cal;
 
     // Retrieve blood flow sensor calibration data and check for sensor connected status
-#ifndef SKIP_POST
+#ifndef SKIP_CALIBRATION_TESTS
     if ( ( TRUE == getCalibrationData( &cal ) ) && ( BFM_SENSOR_PARAM_CORRUPT_STATUS != getFPGABloodFlowMeterStatus() ) )
     {
         bloodFlowCalGain = cal.bloodFlowGain;
Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -rba1f9bf09ef1c19f53cd610b3f5a8ab6b928770b -r85a680de4306aa033b1dc1f386fa5fa0a25cf73b
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision ba1f9bf09ef1c19f53cd610b3f5a8ab6b928770b)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 85a680de4306aa033b1dc1f386fa5fa0a25cf73b)
@@ -1229,7 +1229,7 @@
     SELF_TEST_STATUS_T result = SELF_TEST_STATUS_FAILED;
     CALIBRATION_DATA_T cal;
 
-#ifndef SKIP_POST
+#ifndef SKIP_CALIBRATION_TESTS
     // Retrieve dialysate flow sensor calibration data
     if ( ( TRUE == getCalibrationData( &cal ) ) && ( DFM_SENSOR_PARAM_CORRUPT_STATUS != getFPGADialysateFlowMeterStatus() ) )
     {
Index: firmware/App/HDCommon.h
===================================================================
diff -u -rf25fbefbf6baa354b26dcbe17787821124b56c82 -r85a680de4306aa033b1dc1f386fa5fa0a25cf73b
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision f25fbefbf6baa354b26dcbe17787821124b56c82)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 85a680de4306aa033b1dc1f386fa5fa0a25cf73b)
@@ -59,6 +59,7 @@
     #define ALARMS_DEBUG                    1           // Triggered alarms sent to debug UART
     #define SKIP_SELF_TESTS                 1           // Skip Pre-treatment Self-tests
     #define SKIP_PRIMING                    1           // Skip Pre-treatment Prime
+    #define SKIP_CALIBRATION_TESTS          1           // Skip calibration tests
 //    #define V1_5_SYSTEM                     1           // Build for v1.5 system
 
     #include <stdio.h>