Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r667feab319b14681a0330a715da7a1ba930b518d -r29a2c3c7d7618489c0ada9f98e1d30226b455392
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 667feab319b14681a0330a715da7a1ba930b518d)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 29a2c3c7d7618489c0ada9f98e1d30226b455392)
@@ -1178,7 +1178,8 @@
     BUBBLE_STATUS_T const ADVBubbleStatus = getBubbleStatus( ADV );
 
 #ifndef SKIP_AIR_BUBBLE_CHECK
-    if ( ( BUBBLE_NOT_DETECTED == ADABubbleStatus ) && ( BUBBLE_NOT_DETECTED == ADVBubbleStatus ) )
+    if ( ( ( BUBBLE_NOT_DETECTED == ADABubbleStatus ) && ( BUBBLE_NOT_DETECTED == ADVBubbleStatus ) ) ||
+         ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SELF_TESTS_AIR_BUBBLE_CHECK ) != SW_CONFIG_ENABLE_VALUE ) )
 #endif
     {
         if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_SELF_TEST ) != SW_CONFIG_ENABLE_VALUE )