Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -rb1dc3df084a8517ca1575bdbf741fecd96d56a12 -rb1b5e8659de8f6109c4d77cda98308d1fd9ef165
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision b1dc3df084a8517ca1575bdbf741fecd96d56a12)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision b1b5e8659de8f6109c4d77cda98308d1fd9ef165)
@@ -370,15 +370,19 @@
             ++internalErrorCount[ sensorId ];
             if ( internalErrorCount[ sensorId ] > MAX_ALLOWED_UNCHANGED_CONDUCTIVITY_READS )
             {
+#ifndef DISABLE_COND_SENSOR_CHECK
                 SET_ALARM_WITH_1_U32_DATA( ALARM_ID_CONDUCTIVITY_SENSOR_FAULT, sensorId );
+#endif
             }
         }
     }
     else
     {
         if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_CONDUCTIVITY_SENSOR_ERROR ) )
         {
+#ifndef DISABLE_COND_SENSOR_CHECK
             SET_ALARM_WITH_1_U32_DATA( ALARM_ID_CONDUCTIVITY_SENSOR_FAULT, sensorId );
+#endif
         }
     }
 }
@@ -442,7 +446,9 @@
         ++internalErrorCount[ sensorId ];
         if ( internalErrorCount[ sensorId ] > MAX_ALLOWED_UNCHANGED_CONDUCTIVITY_READS )
         {
+#ifndef DISABLE_COND_SENSOR_CHECK
             SET_ALARM_WITH_1_U32_DATA( ALARM_ID_CONDUCTIVITY_SENSOR_FAULT, sensorId );
+#endif
         }
     }
 }
@@ -502,7 +508,9 @@
     {
         if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_CONDUCTIVITY_SENSOR_ERROR ) )
         {
+#ifndef DISABLE_COND_SENSOR_CHECK
             SET_ALARM_WITH_1_U32_DATA( ALARM_ID_CONDUCTIVITY_SENSOR_FAULT, CONDUCTIVITYSENSORS_CD1_SENSOR );
+#endif
         }
     }
 }
Index: firmware/App/DGCommon.h
===================================================================
diff -u -rb1dc3df084a8517ca1575bdbf741fecd96d56a12 -rb1b5e8659de8f6109c4d77cda98308d1fd9ef165
--- firmware/App/DGCommon.h	(.../DGCommon.h)	(revision b1dc3df084a8517ca1575bdbf741fecd96d56a12)
+++ firmware/App/DGCommon.h	(.../DGCommon.h)	(revision b1b5e8659de8f6109c4d77cda98308d1fd9ef165)
@@ -45,6 +45,7 @@
 //    #define PRESSURES_DEBUG                 1
     #define DISABLE_DIALYSATE_CHECK         1
     #define DISABLE_RO_RATIO_CHECK          1
+    #define DISABLE_COND_SENSOR_CHECK       1
     #include <stdio.h>
     #include <strings.h>
 #endif
Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -ra3e3feea8cfb6a1e0137bf09031f0484a3c73332 -rb1b5e8659de8f6109c4d77cda98308d1fd9ef165
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision a3e3feea8cfb6a1e0137bf09031f0484a3c73332)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision b1b5e8659de8f6109c4d77cda98308d1fd9ef165)
@@ -209,6 +209,7 @@
 
     if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_DIALYSATE_CONDUCTIVITY_OUT_OF_RANGE, !isDialysateConductivityGood ) )
     {
+#ifndef DISABLE_DIALYSATE_CHECK
         if ( FALSE == isAcidConductivityInRange() )
         {
             SET_ALARM_WITH_1_F32_DATA( ALARM_ID_ACID_CONDUCTIVITY_OUT_OF_RANGE, getConductivityValue( CONDUCTIVITYSENSORS_CD1_SENSOR ) );
@@ -217,6 +218,7 @@
         {
             SET_ALARM_WITH_1_F32_DATA( ALARM_ID_DIALYSATE_CONDUCTIVITY_OUT_OF_RANGE, getConductivityValue( CONDUCTIVITYSENSORS_CD2_SENSOR ) );
         }
+#endif
     }
 
     if ( TRUE == isPersistentAlarmConditionCleared( ALARM_ID_DIALYSATE_CONDUCTIVITY_OUT_OF_RANGE, !isDialysateConductivityGood ) )
@@ -271,7 +273,9 @@
 
     handleDialysateMixing();
 
+#ifndef DISABLE_DIALYSATE_CHECK
     if ( TRUE == isBicarbConductivityInRange() )
+#endif
     {
         concentrateTestStartTime = getMSTimerCount();
         requestConcentratePumpsOn( CONCENTRATEPUMPS_CP1_ACID );
@@ -302,7 +306,9 @@
 
     handleDialysateMixing();
 
+#ifndef DISABLE_DIALYSATE_CHECK
     if ( TRUE == isAcidConductivityInRange() )
+#endif
     {
         requestConcentratePumpsOn( CONCENTRATEPUMPS_CP1_ACID );
         requestConcentratePumpsOn( CONCENTRATEPUMPS_CP2_BICARB );