Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rb1f086e7cd292d5a97a7265075400274d60d4fbf -r7e22520266e7e928bc0f37e312e293844a3d8a26
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision b1f086e7cd292d5a97a7265075400274d60d4fbf)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 7e22520266e7e928bc0f37e312e293844a3d8a26)
@@ -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;
@@ -389,7 +389,6 @@
  *************************************************************************/
 void execDrySelfTests( void )
 {
-
     // execute dry self-tests state machine
     switch ( currentDrySelfTestsState )
     {
@@ -1581,8 +1580,11 @@
 {
     WET_SELF_TESTS_STATE_T state = WET_SELF_TESTS_STOPPED_STATE;
 
+    doorClosedRequired( FALSE, FALSE );
+
     if ( TRUE == selfTestsResumeRequested )
     {
+        doorClosedRequired( TRUE, TRUE );
         selfTestsResumeRequested = FALSE;
         state = WET_SELF_TESTS_START_STATE;
     }