Index: firmware/App/Modes/SampleWater.c
===================================================================
diff -u -r3d72b777cf1ceb673d118341c46e2d6d5b7b75f5 -rf6b78d1fe6741043de38707211710ab0e8a08483
--- firmware/App/Modes/SampleWater.c	(.../SampleWater.c)	(revision 3d72b777cf1ceb673d118341c46e2d6d5b7b75f5)
+++ firmware/App/Modes/SampleWater.c	(.../SampleWater.c)	(revision f6b78d1fe6741043de38707211710ab0e8a08483)
@@ -129,9 +129,11 @@
 {
     SELF_TEST_STATUS_T result = SELF_TEST_STATUS_FAILED;
 
-#ifdef SKIP_SAMPLE_WATER
-    sampleWaterResult = TRUE;
-#endif
+    if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_SAMPLE_WATER ) )
+    {
+        sampleWaterResult = TRUE;
+    }
+
     if ( TRUE == sampleWaterResult )
     {
         result = SELF_TEST_STATUS_PASSED;