Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rdb25b02c6528a648e59c75972f1fae193fa55fb0 -r88cba75b7c6f0237344609760b151cbfe9a65024
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision db25b02c6528a648e59c75972f1fae193fa55fb0)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 88cba75b7c6f0237344609760b151cbfe9a65024)
@@ -245,6 +245,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 );
 }
 
 /*********************************************************************//**
@@ -1397,8 +1398,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;