Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rdffadf4519ce379ac4cb80e22c4aa434b848b383 -rb82bc2a2b9d2c8a87721bd3f86f016b7f7e96e02
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision dffadf4519ce379ac4cb80e22c4aa434b848b383)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision b82bc2a2b9d2c8a87721bd3f86f016b7f7e96e02)
@@ -1277,9 +1277,16 @@
 #endif
         {
             zeroBloodLeak();
+            state = WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_STATE;
         }
-
-        state = WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_STATE;
+#ifndef _RELEASE_
+        else
+        {
+            // Skip the blood leak zero state
+            settleStartTime = getMSTimerCount();
+            state = WET_SELF_TESTS_FIRST_DISPLACEMENT_SETUP_STATE;
+        }
+#endif
     }
     else
     {