Index: firmware/App/Modes/ConsumableSelfTest.c
===================================================================
diff -u -rf013ac5e5de456c4fa4367884cda6515f2a51642 -r9e85e7ace1390d48587174a5bc6eb11d5185cea4
--- firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision f013ac5e5de456c4fa4367884cda6515f2a51642)
+++ firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision 9e85e7ace1390d48587174a5bc6eb11d5185cea4)
@@ -88,6 +88,10 @@
             {
                 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;
@@ -96,9 +100,6 @@
                 {
                     currentConsumableSelfTestState = CONSUMABLE_SELF_TESTS_COMPLETE_STATE;
                 }
-#else
-                currentConsumableSelfTestState = CONSUMABLE_SELF_TESTS_COMPLETE_STATE;
-#endif
             }
             break;