Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -re5e75b8c211cf7f26fa5a8adf9290ea0b5d1afbc -re6ce0ae6f62370bc33113bf614678fed170ff3b8
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision e5e75b8c211cf7f26fa5a8adf9290ea0b5d1afbc)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision e6ce0ae6f62370bc33113bf614678fed170ff3b8)
@@ -246,6 +246,7 @@
     setValvePosition( VDO, VALVE_POSITION_A_INSERT_EJECT );
     setValvePosition( VBA, VALVE_POSITION_A_INSERT_EJECT );
     setValvePosition( VBV, VALVE_POSITION_A_INSERT_EJECT );
+    setValveAirTrap( STATE_CLOSED );
 }
 
 /*********************************************************************//**
@@ -1399,8 +1400,8 @@
     }
 
     // After VBT opened, start looking to see if pressures normalize
-    if ( ( STATE_OPEN == getValveAirTrapStatus() ) && ( arterialPressureDiff <= NORMAL_PRESSURE_DIFF_TOLERANCE_MMHG ) &&
-         ( venousPressureDiff <= NORMAL_PRESSURE_DIFF_TOLERANCE_MMHG ) )
+    if ( ( STATE_OPEN == getValveAirTrapStatus() ) &&
+         ( arterialPressureDiff <= NORMAL_PRESSURE_DIFF_TOLERANCE_MMHG ) && ( venousPressureDiff <= NORMAL_PRESSURE_DIFF_TOLERANCE_MMHG ) )
     {
         dryPressureTestsCompleted = TRUE;
         state = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE;