Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rba396353d0b8df1591a142127de146f176331ab6 -r464b5fb48c50c0b46fa352cb887379fd973bf956
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision ba396353d0b8df1591a142127de146f176331ab6)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 464b5fb48c50c0b46fa352cb887379fd973bf956)
@@ -988,9 +988,9 @@
     else
     {
 #ifndef _RELEASE_
-        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_AIR_PUMP ) )
+        if ( SW_CONFIG_DISABLE_VALUE != getSoftwareConfigStatus( SW_CONFIG_DISABLE_AIR_PUMP ) )
         {
-#endif
+
             // Wait for reservoirs to drain before starting this test
             if ( (  getLoadCellWeight( LOAD_CELL_RESERVOIR_1_PRIMARY ) < MAX_EMPTY_RESERVOIR_WEIGHT_G ) && ( getLoadCellWeight( LOAD_CELL_RESERVOIR_2_PRIMARY ) < MAX_EMPTY_RESERVOIR_WEIGHT_G ) )
             {
@@ -1006,6 +1006,20 @@
                 }
             }
         }
+        else
+        {
+            // TODO - wait 1 sec before taking pressure readings and beginning pressure check
+            previousNormalArterialPressure = getFilteredArterialPressure();
+            previousNormalVenousPressure = getFilteredVenousPressure();
+            state = DRY_SELF_TESTS_PRESSURE_SENSORS_VENOUS_SETUP_STATE;
+
+            // Check to see if sensor is within normal ranges before we execute pressure sensor tests
+            if ( ( fabs( previousNormalArterialPressure ) > PRESSURE_CHECK_START_PRESSURE_TOLERANCE_MMHG ) || ( fabs( previousNormalVenousPressure ) > PRESSURE_CHECK_START_PRESSURE_TOLERANCE_MMHG ) )
+            {
+                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE, previousNormalArterialPressure, previousNormalVenousPressure );
+            }
+        }
+#endif
     }
 
     return state;