Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r0bce81180c0ba2b25f5d501ed6aa6b2f9a8b2500 -r66dda999c5736ecec046197ff1c843c01f6aecc5
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 0bce81180c0ba2b25f5d501ed6aa6b2f9a8b2500)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 66dda999c5736ecec046197ff1c843c01f6aecc5)
@@ -1260,22 +1260,21 @@
  *************************************************************************/
 static WET_SELF_TESTS_STATE_T handleWetSelfTestPrimeCheckState( void )
 {
-    WET_SELF_TESTS_STATE_T state = WET_SELF_TESTS_PRIME_CHECK_STATE;
+    WET_SELF_TESTS_STATE_T state    = WET_SELF_TESTS_PRIME_CHECK_STATE;
+    BUBBLE_STATUS_T ADVBubbleStatus = getBubbleStatus( ADV );
 
-    BUBBLE_STATUS_T const ADVBubbleStatus = getBubbleStatus( ADV );
-
     if ( BUBBLE_NOT_DETECTED == ADVBubbleStatus )
     {
 #ifndef _RELEASE_
-        // TODO do we need both of these?
         if ( ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_SELF_TEST ) != SW_CONFIG_ENABLE_VALUE ) &&
              ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SELF_TESTS_AIR_BUBBLE_CHECK ) != SW_CONFIG_ENABLE_VALUE ) )
 #endif
         {
-            zeroBloodLeak();
+            if ( TRUE == zeroBloodLeak() )
+            {
+                state = WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_STATE;
+            }
         }
-
-        state = WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_STATE;
     }
     else
     {