Index: firmware/App/Modes/ConsumableSelfTest.c
===================================================================
diff -u -r61716bc97ecca8af1ec560333844a8cf602eccb0 -rf013ac5e5de456c4fa4367884cda6515f2a51642
--- firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision 61716bc97ecca8af1ec560333844a8cf602eccb0)
+++ firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision f013ac5e5de456c4fa4367884cda6515f2a51642)
@@ -18,6 +18,7 @@
 #include "ConsumableSelfTest.h"
 #include "DGInterface.h"
 #include "ModePreTreat.h"
+#include "NVDataMgmt.h"
 #include "Reservoirs.h"
 
 /**
@@ -78,12 +79,23 @@
 #ifdef SKIP_UI_INTERACTION
             consumableInstallConfirmed = TRUE;
 #endif
+            if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) )
+            {
+                consumableInstallConfirmed = TRUE;
+            }
             // TODO: Check for DG straw door status to be open once DG door driver implemented
             if ( TRUE == consumableInstallConfirmed )
             {
                 consumableInstallConfirmed = FALSE;
 #ifndef SKIP_CONSUMABLE_TESTS
-                currentConsumableSelfTestState = CONSUMABLE_SELF_TESTS_FILL_CMD_STATE;
+                if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_CONSUMABLES_TESTS ) != SW_CONFIG_ENABLE_VALUE )
+                {
+                    currentConsumableSelfTestState = CONSUMABLE_SELF_TESTS_FILL_CMD_STATE;
+                }
+                else
+                {
+                    currentConsumableSelfTestState = CONSUMABLE_SELF_TESTS_COMPLETE_STATE;
+                }
 #else
                 currentConsumableSelfTestState = CONSUMABLE_SELF_TESTS_COMPLETE_STATE;
 #endif