Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r45627442c3b93ec57ed18cd0943eed2662fb2dbc -ree458e1f570438f4ed48612cd5492a97be968274
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 45627442c3b93ec57ed18cd0943eed2662fb2dbc)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision ee458e1f570438f4ed48612cd5492a97be968274)
@@ -218,14 +218,14 @@
     F32 const hepRate = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_DISPENSE_RATE );
 
 #ifndef _RELEASE_
-    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP ) != SW_CONFIG_ENABLE_VALUE )
+    if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP ) )
     {
-        useHeparin = ( ( bolusVol > 0.0 ) || ( hepRate > 0.0 ) ? TRUE : FALSE );
+        useHeparin = FALSE;
     }
     else
 #endif
     {
-        useHeparin = FALSE;
+        useHeparin = ( ( bolusVol > 0.0 ) || ( hepRate > 0.0 ) ? TRUE : FALSE );
     }
 
     currentNoCartSelfTestsState = NO_CART_SELF_TESTS_START_STATE;