Index: firmware/App/Controllers/BloodLeak.c
===================================================================
diff -u -r95561ae1f450dc687b9ce8d4cce2ac91293bc925 -rdd1a9a6f5e43a5da27f4d51f56388f7d019cc43d
--- firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision 95561ae1f450dc687b9ce8d4cce2ac91293bc925)
+++ firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision dd1a9a6f5e43a5da27f4d51f56388f7d019cc43d)
@@ -337,7 +337,9 @@
         }
         else
         {
+#ifndef IGNORE_BLOOD_LEAK_ALARM
             activateAlarmNoData( ALARM_ID_HD_BLOOD_LEAK_SENSOR_SET_POINT_SET_FAILURE );
+#endif
         }
     }
     else
@@ -481,7 +483,7 @@
 {
     BLOOD_LEAK_STATES_T state = BLOOD_LEAK_SELF_TEST_STATE;
 
-#ifndef IGNORE_BLOOD_LEAK_ALARM
+#ifndef IGNORE_BLOOD_LEAK_SELF_TEST
     if ( SELF_TEST_STATUS_IN_PROGRESS == bloodLeakSelfTestStatus )
     {
         if ( FALSE == noFPGABloodLeakDetected() ) // Faked blood leak caused by independent MCU board
@@ -492,8 +494,9 @@
         else if ( TRUE == didTimeout( bloodLeakSelfTestStartTime, BLOOD_LEAK_TIMEOUT_MS ) )
         {
             bloodLeakSelfTestStatus = SELF_TEST_STATUS_FAILED;
-
+#ifndef IGNORE_BLOOD_LEAK_ALARM
             activateAlarmNoData( ALARM_ID_HD_BLOOD_LEAK_SELF_TEST_FAILURE );
+#endif
        }
     }
     else