Index: firmware/App/Modes/SampleWater.c
===================================================================
diff -u -r9feea867113c62088f0ce91750127972dbd9bf53 -re5d1d67106a93a6cd1b5692b586625d715732e2f
--- firmware/App/Modes/SampleWater.c	(.../SampleWater.c)	(revision 9feea867113c62088f0ce91750127972dbd9bf53)
+++ firmware/App/Modes/SampleWater.c	(.../SampleWater.c)	(revision e5d1d67106a93a6cd1b5692b586625d715732e2f)
@@ -124,9 +124,10 @@
 {
     SELF_TEST_STATUS_T result = SELF_TEST_STATUS_FAILED;
 
-#ifndef SKIP_SAMPLE_WATER
-    if ( TRUE == sampleWaterResult )
+#ifdef SKIP_SAMPLE_WATER
+    sampleWaterResult = TRUE;
 #endif
+    if ( TRUE == sampleWaterResult )
     {
         result = SELF_TEST_STATUS_PASSED;
     }