Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r4d509fa074423027c3106a209ead0beffd57cc3e -r59726ffebb87908301907285ff2fe35ee95e6cdf
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 4d509fa074423027c3106a209ead0beffd57cc3e)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 59726ffebb87908301907285ff2fe35ee95e6cdf)
@@ -969,14 +969,11 @@
             state = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
         }
     }
-    else
+
+    if ( TRUE == doesAlarmStatusIndicateStop() )
     {
-        // doorClosedRequired() will trigger alarms if pumpTrack is open
-        if ( TRUE == doesAlarmStatusIndicateStop() )
-        {
-            state = DRY_SELF_TESTS_STOPPED_STATE;
-            setupForSelfTestsStop();
-        }
+        state = DRY_SELF_TESTS_STOPPED_STATE;
+        setupForSelfTestsStop();
     }
 
     return state;