Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r9e85e7ace1390d48587174a5bc6eb11d5185cea4 -rd33ae635eb38ae8f2647f68304be74e8e4f78cfd
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 9e85e7ace1390d48587174a5bc6eb11d5185cea4)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision d33ae635eb38ae8f2647f68304be74e8e4f78cfd)
@@ -222,7 +222,14 @@
     F32 const hepRate = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_DISPENSE_RATE );
 
 #ifndef DISABLE_SYRINGE_PUMP
-    useHeparin = ( ( bolusVol > 0.0 ) || ( hepRate > 0.0 ) ? TRUE : FALSE );
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP ) != SW_CONFIG_ENABLE_VALUE )
+    {
+        useHeparin = ( ( bolusVol > 0.0 ) || ( hepRate > 0.0 ) ? TRUE : FALSE );
+    }
+    else
+    {
+        useHeparin = FALSE;
+    }
 #else
     useHeparin = FALSE;
 #endif