Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r6cd85442baebdeecec6fc9b5009011b8d961f45c -r73634f08cd8701d835977d599a69710bb3e836c0
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 6cd85442baebdeecec6fc9b5009011b8d961f45c)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 73634f08cd8701d835977d599a69710bb3e836c0)
@@ -475,7 +475,9 @@
 
     execSampleWater();
 
+#ifndef SKIP_SAMPLE_WATER
     if ( TRUE == isSampleWaterPassed() )
+#endif
     {
         state = HD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE;
         transitionToConsumableSelfTest();