Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r3c5b521fcaa489eef9df0e2d657c7e0b23dd8ece -r6983aa2059d9827bc2c171f95425dde8ab0e5227
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 3c5b521fcaa489eef9df0e2d657c7e0b23dd8ece)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 6983aa2059d9827bc2c171f95425dde8ab0e5227)
@@ -1155,7 +1155,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 ),
@@ -1164,15 +1164,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;
 }