Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r1356b53e15457e2df35a5260e3f6dc86fdc50b11 -r2b82ac67c25128e6d1fdcccae85720e166bcecea
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 1356b53e15457e2df35a5260e3f6dc86fdc50b11)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 2b82ac67c25128e6d1fdcccae85720e166bcecea)
@@ -49,7 +49,8 @@
 #define DIAL_IN_PUMP_RUN_TIME_PRESSURE_SELF_TEST            ( 20 * MS_PER_SECOND )
 #define DECAY_PRESSURE_SELF_TEST_TIME                       ( 4 * MS_PER_SECOND )                   ///< time to wait for pressure to decay in ms.
 #define STABILTY_PRESSURE_SELF_TEST_TIME                    ( 5 * MS_PER_SECOND )                   ///< Time to wait for pressure to stabilize in ms.
-#define NORMALIZED_PRESSURE_SELF_TEST_TIME                  ( 4 * MS_PER_SECOND )                   ///< Time to wait for pressure to normalize in ms.
+#define NORMALIZED_PRESSURE_SELF_TEST_TIME                  ( 10 * MS_PER_SECOND )                  ///< Time to wait for pressure to normalize in ms.
+#define NORMALIZED_PRESSURE_SELF_TEST_HALF_TIME             ( 5 * MS_PER_SECOND )                   ///< Half the time to wait for pressure to normalize in ms.
 
 #define ARTERIAL_DECAY_PRESSURE_DIFF_TOLERANCE_MMHG         5.0F                                    ///< Difference in arterial pressure readings after the pump stops (in mmHg).
 #define VENOUS_DECAY_PRESSURE_DIFF_TOLERANCE_MMHG           10.0F                                   ///< Difference in venous pressure readings after the pump stops (in mmHg).
@@ -1201,7 +1202,7 @@
         {
             pressureSelfTestNormalizedStartTime = getMSTimerCount();
             setValvePosition( VBV, VALVE_POSITION_B_OPEN );
-            setValveAirTrap( STATE_OPEN );
+
             state = DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE;
         }
         else
@@ -1234,6 +1235,11 @@
     F32 const arterialPressureDiff = fabs( getFilteredArterialPressure() - previousNormalArterialPressure );
     F32 const venousPressureDiff = fabs( getFilteredVenousPressure() - previousNormalVenousPressure );
 
+    if ( TRUE == didTimeout( pressureSelfTestNormalizedStartTime, NORMALIZED_PRESSURE_SELF_TEST_HALF_TIME ) )
+    {
+        setValveAirTrap( STATE_OPEN );
+    }
+
     if ( TRUE == didTimeout( pressureSelfTestNormalizedStartTime, NORMALIZED_PRESSURE_SELF_TEST_TIME ) )
     {
         if ( ( arterialPressureDiff <= NORMAL_PRESSURE_DIFF_TOLERANCE_MMHG ) && ( venousPressureDiff <= NORMAL_PRESSURE_DIFF_TOLERANCE_MMHG ) )