Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r15f9827c863812cfd1f891d22342103fe9a72abc -re5006f5263e8540e730dd802016fef5973ecea4c
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 15f9827c863812cfd1f891d22342103fe9a72abc)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision e5006f5263e8540e730dd802016fef5973ecea4c)
@@ -1233,17 +1233,18 @@
 
     BUBBLE_STATUS_T const ADVBubbleStatus = getBubbleStatus( ADV );
 
-#ifndef SKIP_AIR_BUBBLE_CHECK
-    if ( ( BUBBLE_NOT_DETECTED == ADABubbleStatus ) && ( BUBBLE_NOT_DETECTED == ADVBubbleStatus ) )
-#endif
-    {
 
-#ifndef IGNORE_BLOOD_LEAK_SELF_TEST
-        //if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_SELF_TEST ) != SW_CONFIG_ENABLE_VALUE )
+    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();
         }
-#endif
+
         state = WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_STATE;
         *result = SELF_TEST_STATUS_PASSED;
     }