Index: firmware/App/Monitors/WaterQualityMonitor.c
===================================================================
diff -u -rf1de0420490d71f85393a1e281bbbbc87a232c64 -ra81216e3cf497a683ff13ff0374d8aa9c53ec4f6
--- firmware/App/Monitors/WaterQualityMonitor.c	(.../WaterQualityMonitor.c)	(revision f1de0420490d71f85393a1e281bbbbc87a232c64)
+++ firmware/App/Monitors/WaterQualityMonitor.c	(.../WaterQualityMonitor.c)	(revision a81216e3cf497a683ff13ff0374d8aa9c53ec4f6)
@@ -365,7 +365,10 @@
     BOOL isConductivtyOutOfLowRange = FALSE;
 
     isConductivtyOutOfLowRange = ( ( conductivityP9 > INLET_CONDUCTIVITY_HIGH_THRESHOLD_US ) ? TRUE : FALSE );
-    checkPersistentAlarm( ALARM_ID_FP_INLET_CONDUCTIVITY_OUT_HIGH_RANGE, isConductivtyOutOfLowRange, conductivityP9, INLET_CONDUCTIVITY_HIGH_THRESHOLD_US );
+    if ( getTestConfigStatus( TEST_CONFIG_DISABLE_FP_CONDUCTIVITY_ALARMS ) != TRUE )
+    {
+        checkPersistentAlarm( ALARM_ID_FP_INLET_CONDUCTIVITY_OUT_HIGH_RANGE, isConductivtyOutOfLowRange, conductivityP9, INLET_CONDUCTIVITY_HIGH_THRESHOLD_US );
+    }
 }
 
 /*********************************************************************//**
@@ -384,7 +387,10 @@
     BOOL isConductivityOutOfLowRange = FALSE;
 
     isConductivityOutOfLowRange = ( ( conductivityP18 > OUTLET_CONDUCTIVITY_HIGH_THRESHOLD_US ) ? TRUE : FALSE );
-    checkPersistentAlarm( ALARM_ID_FP_RO_OUTLET_CONDUCTIVITY_HIGH_RANGE, isConductivityOutOfLowRange, conductivityP18, OUTLET_CONDUCTIVITY_HIGH_THRESHOLD_US );
+    if ( getTestConfigStatus( TEST_CONFIG_DISABLE_FP_CONDUCTIVITY_ALARMS ) != TRUE )
+    {
+        checkPersistentAlarm( ALARM_ID_FP_RO_OUTLET_CONDUCTIVITY_HIGH_RANGE, isConductivityOutOfLowRange, conductivityP18, OUTLET_CONDUCTIVITY_HIGH_THRESHOLD_US );
+    }
 }
 
 /*********************************************************************//**
@@ -404,7 +410,10 @@
     //TODO update the macro with value from institutional configuration
     if ( avgRORR < MIN_RO_REJECTION_RATIO_PCT )
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_REJECTION_RATIO_LOW_RANGE, avgRORR, MIN_RO_REJECTION_RATIO_PCT )
+        if ( getTestConfigStatus( TEST_CONFIG_DISABLE_FP_CONDUCTIVITY_ALARMS ) != TRUE )
+        {
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_REJECTION_RATIO_LOW_RANGE, avgRORR, MIN_RO_REJECTION_RATIO_PCT )
+        }
     }
 }