Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r29a2c3c7d7618489c0ada9f98e1d30226b455392 -r2a3a47ca90ad19851a30c52f6999a56d5f578783
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 29a2c3c7d7618489c0ada9f98e1d30226b455392)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 2a3a47ca90ad19851a30c52f6999a56d5f578783)
@@ -1177,12 +1177,14 @@
 
     BUBBLE_STATUS_T const ADVBubbleStatus = getBubbleStatus( ADV );
 
-#ifndef SKIP_AIR_BUBBLE_CHECK
-    if ( ( ( BUBBLE_NOT_DETECTED == ADABubbleStatus ) && ( BUBBLE_NOT_DETECTED == ADVBubbleStatus ) ) ||
-         ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SELF_TESTS_AIR_BUBBLE_CHECK ) != SW_CONFIG_ENABLE_VALUE ) )
-#endif
+
+    if ( BUBBLE_NOT_DETECTED == ADVBubbleStatus )
     {
-        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_SELF_TEST ) != SW_CONFIG_ENABLE_VALUE )
+#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();
         }