Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rdcd956fa52aef8f27bba867e54f764bebd384c99 -r15f9827c863812cfd1f891d22342103fe9a72abc
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision dcd956fa52aef8f27bba867e54f764bebd384c99)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 15f9827c863812cfd1f891d22342103fe9a72abc)
@@ -225,11 +225,15 @@
     F32 const bolusVol = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME );
     F32 const hepRate = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_DISPENSE_RATE );
 
-#ifndef DISABLE_SYRINGE_PUMP
-    useHeparin = ( ( bolusVol > 0.0 ) || ( hepRate > 0.0 ) ? TRUE : FALSE );
-#else
-    useHeparin = FALSE;
-#endif
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP ) != SW_CONFIG_ENABLE_VALUE )
+    {
+        useHeparin = ( ( bolusVol > 0.0 ) || ( hepRate > 0.0 ) ? TRUE : FALSE );
+    }
+    else
+    {
+        useHeparin = FALSE;
+    }
+
     currentNoCartSelfTestsState = NO_CART_SELF_TESTS_START_STATE;
     runPumpStartTime = 0;
     havePumpsStarted = FALSE;
@@ -382,17 +386,15 @@
     switch ( currentDrySelfTestsState )
     {
         case DRY_SELF_TESTS_START_STATE:
-#ifdef SKIP_DRY_SELF_TESTS
-            //if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) != SW_CONFIG_ENABLE_VALUE )
+            if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) )
             {
                 // TODO: Remove once dry self-test is ready to use
                 currentDrySelfTestsState = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE;
             }
-#else
+            else
             {
                 currentDrySelfTestsState = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
             }
-#endif
             break;
 
         case DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE:
@@ -1072,16 +1074,15 @@
     if ( TRUE == selfTestsResumeRequested )
     {
         selfTestsResumeRequested = FALSE;
-#ifndef SKIP_DRY_SELF_TESTS
-        //if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) != SW_CONFIG_ENABLE_VALUE )
+
+        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) != SW_CONFIG_ENABLE_VALUE )
         {
             state = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
         }
-#else
+        else
         {
             state = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE;
         }
-#endif
     }
 
     return state;