Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r9e2667ac9d2f1b2add9811f93477f0365f1b4eb7 -r9316f6769a2f4ac9f85847cbc22166c8b43cef83
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 9e2667ac9d2f1b2add9811f93477f0365f1b4eb7)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 9316f6769a2f4ac9f85847cbc22166c8b43cef83)
@@ -1267,12 +1267,14 @@
     // Retrieve blood flow sensor calibration data and check for sensor connected status
 #ifndef SKIP_CALIBRATION_TESTS
     if ( ( TRUE == getCalibrationData( &cal ) ) && ( BFM_SENSOR_PARAM_CORRUPT_STATUS != getFPGABloodFlowMeterStatus() ) )
-#endif
     {
         bloodFlowCalGain = cal.bloodFlowGain;
         bloodFlowCalOffset = cal.bloodFlowOffset_mL_min;
         result = SELF_TEST_STATUS_PASSED;
     }
+#else
+    result = SELF_TEST_STATUS_PASSED;
+#endif
 
     return result;
 }