Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rf237976ac5eb469200dfd547252720e6ea7211c4 -rdc69c369866d4ca8e84e8e3906f2a716dda3089d
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision f237976ac5eb469200dfd547252720e6ea7211c4)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision dc69c369866d4ca8e84e8e3906f2a716dda3089d)
@@ -987,18 +987,23 @@
     }
     else
     {
-        // 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 ) )
+#ifndef _RELEASE_
+        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_AIR_PUMP ) )
         {
-            // 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 ) )
+#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 ) )
             {
-                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE, previousNormalArterialPressure, previousNormalVenousPressure );
+                // 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 );
+                }
             }
         }
     }