Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -rc049177f4d18a4740a357941b48a833d7115b581 -r17d7a287b62351847759e24e5be390db19c4a531
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision c049177f4d18a4740a357941b48a833d7115b581)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 17d7a287b62351847759e24e5be390db19c4a531)
@@ -26,6 +26,7 @@
 #include "Pressures.h"
 #include "Switches.h"
 #include "TaskGeneral.h"
+#include "TestSupport.h"
 #include "Timers.h"
 #include "Utilities.h"
 #include "Valve3Way.h"
@@ -397,6 +398,12 @@
         result = AIR_TRAP_MANUAL_CONTROL_STATE;
     }
 
+    // Skip fill and lower level events when no tubing set is installed
+    else if( TRUE == getTestConfigStatus( TEST_CONFIG_TESTING_WITHOUT_TUBING_SET ))
+    {
+        result = AIR_TRAP_CLOSED_STATE;
+    }
+
     // Lower air trap level if fluid reaches upper level.
     else if ( AIR_TRAP_LEVEL_FLUID == getLevelSensorState( H16_LEVL ) )
     {
Index: firmware/App/Monitors/Bubbles.c
===================================================================
diff -u -rf289a9279e8e924fd11411df6a71ac6727b800bc -r17d7a287b62351847759e24e5be390db19c4a531
--- firmware/App/Monitors/Bubbles.c	(.../Bubbles.c)	(revision f289a9279e8e924fd11411df6a71ac6727b800bc)
+++ firmware/App/Monitors/Bubbles.c	(.../Bubbles.c)	(revision 17d7a287b62351847759e24e5be390db19c4a531)
@@ -21,6 +21,7 @@
 #include "Messaging.h"
 #include "OperationModes.h"
 #include "TaskPriority.h"
+#include "TestSupport.h"
 #include "Timers.h"
 
 /**
@@ -223,7 +224,11 @@
             // Check for venous bubble alarm if enabled.
             if ( BUBBLE_DETECTED == getBubbleDetectedState( bubble ) )
             {
-                activateAlarmNoData( ALARM_ID_TD_VENOUS_BUBBLE_DETECTED );
+                //Skip venous bubble alarm when no tubing set is installed
+                if ( FALSE == getTestConfigStatus(TEST_CONFIG_TESTING_WITHOUT_TUBING_SET) )
+                {
+                    activateAlarmNoData( ALARM_ID_TD_VENOUS_BUBBLE_DETECTED );
+                }
             }
         }