Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -re0e5aff5a2d873dac91dfb1c1086572f7f1647da -r2cda58ab3f4f273b9afdbd95eeaa15f23777b5fd
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision e0e5aff5a2d873dac91dfb1c1086572f7f1647da)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 2cda58ab3f4f273b9afdbd95eeaa15f23777b5fd)
@@ -292,7 +292,11 @@
     switch ( currentDrySelfTestsState )
     {
         case DRY_SELF_TESTS_START_STATE:
+#ifdef SKIP_SELF_TESTS
+            currentDrySelfTestsState = DRY_SELF_TESTS_COMPLETE;
+#else
             currentDrySelfTestsState = DRY_SELF_TESTS_BUBBLE_DETECTOR_STATE;
+#endif
             break;
 
         case DRY_SELF_TESTS_BUBBLE_DETECTOR_STATE:
@@ -415,11 +419,7 @@
  *************************************************************************/
 BOOL isDrySelfTestsPassed( void )
 {
-#ifdef SKIP_SELF_TESTS
-    return TRUE;
-#else
     return drySelfTestsResult;
-#endif
 }
 
 /*********************************************************************//**
@@ -451,7 +451,11 @@
     switch ( currentWetSelfTestsState )
     {
         case WET_SELF_TESTS_START_STATE:
+#ifdef SKIP_SELF_TESTS
+            currentWetSelfTestsState = WET_SELF_TESTS_COMPLETE;
+#else
             currentWetSelfTestsState = WET_SELF_TESTS_BUBBLE_DETECTOR_STATE;
+#endif
             break;
 
         case WET_SELF_TESTS_BUBBLE_DETECTOR_STATE:
@@ -499,11 +503,7 @@
  *************************************************************************/
 BOOL isWetSelfTestsPassed( void )
 {
-#ifdef SKIP_SELF_TESTS
-    return TRUE;
-#else
     return wetSelfTestsResult;
-#endif
 }
 
 /**@}*/