Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r936acbb405970a406c8b1f557ea727e7cbf74c94 -r9e2667ac9d2f1b2add9811f93477f0365f1b4eb7
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 936acbb405970a406c8b1f557ea727e7cbf74c94)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 9e2667ac9d2f1b2add9811f93477f0365f1b4eb7)
@@ -223,11 +223,7 @@
     switch ( currentNoCartSelfTestsState )
     {
         case NO_CART_SELF_TESTS_START_STATE:
-#ifdef SKIP_SELF_TESTS
-            currentNoCartSelfTestsState = NO_CART_SELF_TESTS_HOME_VALVES_AND_PUMPS_STATE;
-#else
             currentNoCartSelfTestsState = NO_CART_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
-#endif
             break;
 
         case NO_CART_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE:
@@ -368,7 +364,7 @@
     switch ( currentDrySelfTestsState )
     {
         case DRY_SELF_TESTS_START_STATE:
-#ifdef SKIP_SELF_TESTS
+#ifdef SKIP_DRY_SELF_TESTS
             currentDrySelfTestsState = DRY_SELF_TESTS_COMPLETE_STATE;
 #else
             currentDrySelfTestsState = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;