Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r71fb5e20c47f242c1741a702bbdbd641347676b4 -r8e0f53b8ba1373df06b7f2e07daa22d1ef494b20
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 71fb5e20c47f242c1741a702bbdbd641347676b4)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 8e0f53b8ba1373df06b7f2e07daa22d1ef494b20)
@@ -389,7 +389,7 @@
     selfTestStartTime = getMSTimerCount();
     selfTestPreviousPublishDataTime = getMSTimerCount();
 
-    doorClosedRequired( TRUE, TRUE );
+    doorClosedRequired( FALSE, TRUE );
 
     // Pumps should be off
     signalBloodPumpHardStop();
@@ -889,14 +889,13 @@
     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
         if ( TRUE == didTimeout( selfTestStartTime, CARTRIDGE_INSERT_PRESSURE_SETTLE_TIME_MS ) )
         {
             setOcclusionInstallLevel();  // Record occlusion pressure level after a new cartridge is installed
+            doorClosedRequired( TRUE, TRUE );
 #ifndef _RELEASE_
             if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) )
             {
@@ -1489,16 +1488,18 @@
         // Restart self-test start time
         selfTestStartTime = getMSTimerCount();
         selfTestsResumeRequested = FALSE;
-        doorClosedRequired( TRUE, TRUE );
+
 #ifndef _RELEASE_
-        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) != SW_CONFIG_ENABLE_VALUE )
+        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) )
         {
-            state = DRY_SELF_TESTS_START_STATE;
+            doorClosedRequired( TRUE, TRUE );
+            state = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE;
         }
         else
 #endif
         {
-            state = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE;
+            doorClosedRequired( FALSE, TRUE );
+            state = DRY_SELF_TESTS_START_STATE;
         }
     }