Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -rb1f086e7cd292d5a97a7265075400274d60d4fbf -r24bf7fee816f79d88f2528cdea64016771fde95e
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision b1f086e7cd292d5a97a7265075400274d60d4fbf)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 24bf7fee816f79d88f2528cdea64016771fde95e)
@@ -1156,7 +1156,7 @@
  *************************************************************************/
 SELF_TEST_STATUS_T execSyringePumpSelfTest( void )
 {
-    SELF_TEST_STATUS_T result = SELF_TEST_STATUS_IN_PROGRESS;
+    SELF_TEST_STATUS_T result = SELF_TEST_STATUS_PASSED;
     F32 DACDeltaV;
     // Read/check force sensor calibration
     BOOL calStatus = getNVRecord2Driver( GET_CAL_HEPARIN_FORCE_SENSOR, (U08*)&forceSensorCalRecord, sizeof( HD_HEPARIN_FORCE_SENSOR_CAL_RECORD_T ),
@@ -1165,15 +1165,20 @@
     // Verify calibration
     DACDeltaV = fabs( forceSensorCalRecord.hdHeparinForceSensorDACVoltage - getSyringePumpForceV() );
 
-    if ( ( TRUE == calStatus ) && ( DACDeltaV > SYRINGE_PUMP_DAC_VOLTAGE_MAX_ERROR ) )
+#ifndef _RELEASE_
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
+#endif
     {
-        result = SELF_TEST_STATUS_PASSED;
+        if ( ( TRUE == calStatus ) && ( DACDeltaV > SYRINGE_PUMP_DAC_VOLTAGE_MAX_ERROR ) )
+        {
+            result = SELF_TEST_STATUS_PASSED;
+        }
+        else
+        {
+            result = SELF_TEST_STATUS_FAILED;
+            activateAlarmNoData( ALARM_ID_HD_SYRINGE_PUMP_SELF_TEST_FAILURE );
+        }
     }
-    else
-    {
-        result = SELF_TEST_STATUS_FAILED;
-        activateAlarmNoData( ALARM_ID_HD_SYRINGE_PUMP_SELF_TEST_FAILURE );
-    }
 
     return result;
 }