Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rf013ac5e5de456c4fa4367884cda6515f2a51642 -r9e85e7ace1390d48587174a5bc6eb11d5185cea4
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision f013ac5e5de456c4fa4367884cda6515f2a51642)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 9e85e7ace1390d48587174a5bc6eb11d5185cea4)
@@ -379,7 +379,12 @@
     {
         case DRY_SELF_TESTS_START_STATE:
 #ifdef SKIP_DRY_SELF_TESTS
-            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) == SW_CONFIG_ENABLE_VALUE )
+            // TODO: Remove once dry self-test is ready to use
+            currentDrySelfTestsState = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE;
+#else
+            //currentDrySelfTestsState = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
+#endif
+            if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) )
             {
                 // TODO: Remove once dry self-test is ready to use
                 currentDrySelfTestsState = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE;
@@ -388,11 +393,6 @@
             {
                 currentDrySelfTestsState = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
             }
-#else
-            {
-                currentDrySelfTestsState = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
-            }
-#endif
             break;
 
         case DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE:
@@ -1041,6 +1041,10 @@
     {
         selfTestsResumeRequested = FALSE;
 #ifndef SKIP_DRY_SELF_TESTS
+        //state = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
+#else
+        state = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE;
+#endif
         if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) != SW_CONFIG_ENABLE_VALUE )
         {
             state = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
@@ -1049,7 +1053,6 @@
         {
             state = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE;
         }
-#endif
     }
 
     return state;