Index: firmware/App/HDCommon.h
===================================================================
diff -u -r9e2667ac9d2f1b2add9811f93477f0365f1b4eb7 -r73634f08cd8701d835977d599a69710bb3e836c0
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 9e2667ac9d2f1b2add9811f93477f0365f1b4eb7)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 73634f08cd8701d835977d599a69710bb3e836c0)
@@ -57,9 +57,10 @@
 //    #define READ_FPGA_ASYNC_DATA            1           // Test build reads non-priority register page every other time
 //    #define EMC_TEST_BUILD                  1           // EMC test build - HD/DG run separately but connected, HD pumps toggle on/off w/ stop button
     #define ALARMS_DEBUG                    1           // Triggered alarms sent to debug UART
-//    #define SKIP_PRIMING                    1           // Skip Pre-treatment Prime
+    #define SKIP_PRIMING                    1           // Skip Pre-treatment Prime
     #define SKIP_WET_SELF_TESTS             1           // Skip Pre-treatment prime wet self-tests
 //    #define V1_5_SYSTEM                     1           // Build for v1.5 system
+    #define SKIP_SAMPLE_WATER               1           // Skip pre-treatment sample water
     #define SKIP_CONSUMABLE_TESTS           1           // Skip pre-treatment consumable Self-tests
     #define SKIP_CALIBRATION_TESTS          1           // Skip pre-treatment self-tests involving calibration
     #define SKIP_DRY_SELF_TESTS             1           // Skip pre-treatment dry self-tests
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();