Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r3fc2a198a40b588b8d1a5684838be098456ad023 -r89c6599d70e2d217019c28636386923d3726b508
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 3fc2a198a40b588b8d1a5684838be098456ad023)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 89c6599d70e2d217019c28636386923d3726b508)
@@ -1342,7 +1342,8 @@
      if ( TRUE == reservoirStatus[ inactiveRes ].flushComplete )
      {
  #ifndef _RELEASE_
-         if ( ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) ) )
+         if ( ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) ) ||
+                 ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_WET_SELF_TEST ) ) )
          {
              if ( DG_RESERVOIR_1 == inactiveRes )
              {
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r3fc2a198a40b588b8d1a5684838be098456ad023 -r89c6599d70e2d217019c28636386923d3726b508
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 3fc2a198a40b588b8d1a5684838be098456ad023)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 89c6599d70e2d217019c28636386923d3726b508)
@@ -580,7 +580,8 @@
     WET_SELF_TESTS_STATE_T priorSubState = currentWetSelfTestsState;
 
 #ifndef _RELEASE_
-    if ( ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_WET_SELF_TEST ) ) )
+    if ( ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) ) ||
+         ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_WET_SELF_TEST ) ) )
     {
         currentWetSelfTestsState = WET_SELF_TESTS_COMPLETE_STATE;
     }
@@ -1515,7 +1516,8 @@
     }
 
 #ifndef _RELEASE_
-    if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_AIR_PUMP ) )  // Allow res 1&2 fills now if air pump not disabled
+    if ( ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_AIR_PUMP ) ) ||  // Allow res 1&2 fills now if air pump not disabled
+         ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) ) )
     {
         if ( state != DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE )
         {