Index: firmware/App/Controllers/BloodLeak.c
===================================================================
diff -u -rf416391a93d78ea154b43afd09a8764e2573fd9a -r7c0f0fa22adeb8e268ce1197a9de6adf11d5c09b
--- firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision f416391a93d78ea154b43afd09a8764e2573fd9a)
+++ firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision 7c0f0fa22adeb8e268ce1197a9de6adf11d5c09b)
@@ -671,6 +671,13 @@
  *************************************************************************/
 SELF_TEST_STATUS_T getBloodLeakSelfTestStatus( void )
 {
+#ifndef _RELEASE_
+    if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_SELF_TEST ) )
+    {
+        bloodLeakSelfTestStatus = SELF_TEST_STATUS_PASSED;
+    }
+#endif
+
     return bloodLeakSelfTestStatus;
 }
 
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r716b61499fa47f3498232337292ede179b12703f -r7c0f0fa22adeb8e268ce1197a9de6adf11d5c09b
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 716b61499fa47f3498232337292ede179b12703f)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 7c0f0fa22adeb8e268ce1197a9de6adf11d5c09b)
@@ -1277,13 +1277,8 @@
 
     if ( SELF_TEST_STATUS_PASSED == getBloodLeakSelfTestStatus() )
     {
-#ifndef _RELEASE_
-        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_SELF_TEST ) != SW_CONFIG_ENABLE_VALUE )
-#endif
-        {
-            settleStartTime = getMSTimerCount();
-            state = WET_SELF_TESTS_FIRST_DISPLACEMENT_SETUP_STATE;
-        }
+        settleStartTime = getMSTimerCount();
+        state = WET_SELF_TESTS_FIRST_DISPLACEMENT_SETUP_STATE;
     }
 
     if ( TRUE == doesAlarmStatusIndicateStop() )