Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r19a8bf98a7154e24c35da25225d4b55bf70ddd09 -r9bf209fc5813b7e806f51f408ece77174a336c9b
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 19a8bf98a7154e24c35da25225d4b55bf70ddd09)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 9bf209fc5813b7e806f51f408ece77174a336c9b)
@@ -233,6 +233,8 @@
     selfTestStartTime = getMSTimerCount();
     selfTestPreviousPublishDataTime = getMSTimerCount();
 
+    doorClosedRequired( TRUE, TRUE );
+
     // Pumps should be off
     signalBloodPumpHardStop();
     signalDialInPumpHardStop();
@@ -359,6 +361,8 @@
     selfTestStartTime = getMSTimerCount();
     selfTestPreviousPublishDataTime = getMSTimerCount();
 
+    doorClosedRequired( TRUE, TRUE );
+
     // Pumps should be off
     signalBloodPumpHardStop();
     signalDialInPumpHardStop();
@@ -666,14 +670,6 @@
     signalDialOutPumpHardStop();
     selfTestStartTime = getMSTimerCount();
 
-#ifndef _RELEASE_
-    if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_SWITCHES_MONITOR ) )
-    {
-        frontDoor = STATE_CLOSED;
-        pumpTrack = STATE_CLOSED;
-    }
-#endif
-
     // TODO: Use appropriate sensor driver
     if ( ( STATE_CLOSED == frontDoor ) && ( STATE_CLOSED == pumpTrack ) )
     {
@@ -830,13 +826,16 @@
 {
     NO_CART_SELF_TESTS_STATE_T state = NO_CART_SELF_TESTS_STOPPED_STATE;
 
+    doorClosedRequired( FALSE, FALSE );
+
     // Restart self-test start time
     selfTestStartTime = getMSTimerCount();
 
     if ( TRUE == selfTestsResumeRequested )
     {
         selfTestsResumeRequested = FALSE;
         havePumpsStarted = FALSE;
+        doorClosedRequired( TRUE, TRUE );
         state = NO_CART_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
     }
 
@@ -860,14 +859,6 @@
     // Restart self-test start time
     selfTestStartTime = getMSTimerCount();
 
-#ifndef _RELEASE_
-    if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_SWITCHES_MONITOR ) )
-    {
-        frontDoor = STATE_CLOSED;
-        pumpTrack = STATE_CLOSED;
-    }
-#endif
-
     // TODO: Use appropriate sensor driver
     if (( STATE_CLOSED == frontDoor ) && (STATE_CLOSED == pumpTrack ) )
     {
@@ -1126,12 +1117,15 @@
 {
     DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_STOPPED_STATE;
 
+    doorClosedRequired( FALSE, FALSE );
+
     // Restart self-test start time
     selfTestStartTime = getMSTimerCount();
 
     if ( TRUE == selfTestsResumeRequested )
     {
         selfTestsResumeRequested = FALSE;
+        doorClosedRequired( TRUE, TRUE );
 #ifndef _RELEASE_
         if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) != SW_CONFIG_ENABLE_VALUE )
         {