Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r393fa8c04b3d7fddd929080488bc2ee68042837e -r71fb5e20c47f242c1741a702bbdbd641347676b4
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 393fa8c04b3d7fddd929080488bc2ee68042837e)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 71fb5e20c47f242c1741a702bbdbd641347676b4)
@@ -889,6 +889,8 @@
     DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_START_STATE;
     OPN_CLS_STATE_T pumpTrack    = getSwitchStatus( PUMP_TRACK_SWITCH );
 
+    doorClosedRequired( FALSE, TRUE );
+
     if ( STATE_CLOSED == pumpTrack )
     {
         // Ensure occlusion sensor has time to settle after cartridge insertion before starting dry self-tests
@@ -908,6 +910,16 @@
         }
     }
 
+    else
+    {
+        // doorClosedRequired() will trigger alarms if pumpTrack is open
+        if ( TRUE == doesAlarmStatusIndicateStop() )
+        {
+            state = DRY_SELF_TESTS_STOPPED_STATE;
+            setupForSelfTestsStop();
+        }
+    }
+
     return state;
 }