Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r39c791d03f363ce2c684597080fc8c2f5515976f -r40f46e196349e3dd730048a354df8bbb2e40407d
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 39c791d03f363ce2c684597080fc8c2f5515976f)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 40f46e196349e3dd730048a354df8bbb2e40407d)
@@ -379,10 +379,15 @@
     {
         case DRY_SELF_TESTS_START_STATE:
 #ifdef SKIP_DRY_SELF_TESTS
-            // TODO: Remove once dry self-test is ready to use
-            currentDrySelfTestsState = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE;
-#else
-            currentDrySelfTestsState = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
+            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) != SW_CONFIG_ENABLE_VALUE )
+            {
+                // TODO: Remove once dry self-test is ready to use
+                currentDrySelfTestsState = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE;
+            }
+            else
+            {
+                currentDrySelfTestsState = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
+            }
 #endif
             break;
 
@@ -1032,9 +1037,14 @@
     {
         selfTestsResumeRequested = FALSE;
 #ifndef SKIP_DRY_SELF_TESTS
-        state = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
-#else
-        state = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE;
+        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) != SW_CONFIG_ENABLE_VALUE )
+        {
+            state = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
+        }
+        else
+        {
+            state = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE;
+        }
 #endif
     }
 
@@ -1171,7 +1181,11 @@
     if ( ( BUBBLE_NOT_DETECTED == ADABubbleStatus ) && ( BUBBLE_NOT_DETECTED == ADVBubbleStatus ) )
 #endif
     {
-        zeroBloodLeak();
+        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_SELF_TEST ) != SW_CONFIG_ENABLE_VALUE )
+        {
+            zeroBloodLeak();
+        }
+
         state = WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_STATE;
         *result = SELF_TEST_STATUS_PASSED;
     }
@@ -1197,7 +1211,8 @@
 {
     WET_SELF_TESTS_STATE_T state = WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_STATE;
 
-    if ( SELF_TEST_STATUS_PASSED == getBloodLeakSelfTestStatus() )
+    if ( ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_SELF_TEST ) != SW_CONFIG_ENABLE_VALUE ) ||
+         ( SELF_TEST_STATUS_PASSED == getBloodLeakSelfTestStatus() ) )
     {
         settleStartTime = getMSTimerCount();
         state = WET_SELF_TESTS_FIRST_DISPLACEMENT_SETUP_STATE;