Index: firmware/App/Modes/ConsumableSelfTest.c
===================================================================
diff -u -rc6101800dd5b813795ee0da21c7ae4f3d6f88579 -rf5e4dee5d7f73017ca22482ec9edf51cf2dc33c2
--- firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision c6101800dd5b813795ee0da21c7ae4f3d6f88579)
+++ firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision f5e4dee5d7f73017ca22482ec9edf51cf2dc33c2)
@@ -18,6 +18,7 @@
 #include "ConsumableSelfTest.h"
 #include "DGInterface.h"
 #include "ModePreTreat.h"
+#include "NVDataMgmt.h"
 #include "Reservoirs.h"
 
 /**
@@ -75,18 +76,23 @@
     switch( currentConsumableSelfTestState )
     {
         case CONSUMABLE_SELF_TESTS_INSTALL_STATE:
-#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;
-#else
-                currentConsumableSelfTestState = CONSUMABLE_SELF_TESTS_COMPLETE_STATE;
-#endif
+
+                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;
+                }
             }
             break;