Index: firmware/App/Drivers/SafetyShutdown.c
===================================================================
diff -u -rccfd15568f1e3d304320c2babb2fd4bcf0413304 -rb3375bb1bc7910b7f45922d2eb4e55bb1dcc3c16
--- firmware/App/Drivers/SafetyShutdown.c	(.../SafetyShutdown.c)	(revision ccfd15568f1e3d304320c2babb2fd4bcf0413304)
+++ firmware/App/Drivers/SafetyShutdown.c	(.../SafetyShutdown.c)	(revision b3375bb1bc7910b7f45922d2eb4e55bb1dcc3c16)
@@ -138,12 +138,14 @@
                 F32 v24 = getIntADCVoltageConverted( INT_ADC_24V_ACTUATORS );
                 F32 audioCurrent = getFPGABackupAlarmAudioCurrent();
 
+#ifndef DISABLE_WD_AND_SFTY_POST_TESTS
                 // Verify 24V is down when w.d. expired
                 if ( v24 > MAX_24V_LEVEL_ON_SAFETY_SHUTDOWN )
                 {
                     SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_SAFETY_SHUTDOWN_POST_TEST_FAILED, (F32)SAFETY_POST_24V_NOT_CUT, v24 );
                     safetyShutdownSelfTestStatus = SELF_TEST_STATUS_FAILED;
                 }
+#endif
                 safetyShutdownSelfTestTimerCount = getMSTimerCount();
                 CLR_SAFETY_SHUTDOWN();
                 safetyShutdownActivated = FALSE;
@@ -157,13 +159,15 @@
                 F32 v24 = getIntADCVoltageConverted( INT_ADC_24V_ACTUATORS );
                 F32 audioCurrent = getFPGABackupAlarmAudioCurrent();
 
+#ifndef DISABLE_WD_AND_SFTY_POST_TESTS
                 // Verify 24V is down when w.d. recovered
                 if ( v24 < MIN_24V_LEVEL_ON_SAFETY_RECOVER )
                 {
                     SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_SAFETY_SHUTDOWN_POST_TEST_FAILED, (F32)SAFETY_POST_NO_24V_RESTORE, v24 );
                     safetyShutdownSelfTestStatus = SELF_TEST_STATUS_FAILED;
                 }
                 else
+#endif
                 {
                     safetyShutdownSelfTestStatus = SELF_TEST_STATUS_PASSED;
                 }
Index: firmware/App/HDCommon.h
===================================================================
diff -u -rd270bdd420b6cab26851f3f195256b5c4b383d43 -rb3375bb1bc7910b7f45922d2eb4e55bb1dcc3c16
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision d270bdd420b6cab26851f3f195256b5c4b383d43)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision b3375bb1bc7910b7f45922d2eb4e55bb1dcc3c16)
@@ -78,6 +78,7 @@
 //    #define DISABLE_BUBBLE_ALARMS           1           // Disable bubble alarms
     #define DISABLE_UI_POST_TEST            1           // Disable the UI POST
 //    #define DISABLE_UI_COMM_TO_ALARM        1           // Disable UI comm timeouts
+    #define DISABLE_WD_AND_SFTY_POST_TESTS  1           // Disable watchdog and safety shutdown POST tests
 
     // Skip Pre-Treatment and get to treatment as soon as possible
     #define SKIP_UI_INTERACTION             1           // Skip UI interaction.
Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -r09e6cf9de34acf18f6e1138bf56ac0edb4821186 -rb3375bb1bc7910b7f45922d2eb4e55bb1dcc3c16
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 09e6cf9de34acf18f6e1138bf56ac0edb4821186)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision b3375bb1bc7910b7f45922d2eb4e55bb1dcc3c16)
@@ -159,6 +159,7 @@
 {
     SELF_TEST_STATUS_T result = SELF_TEST_STATUS_IN_PROGRESS;
 
+#ifndef DISABLE_WD_AND_SFTY_POST_TESTS
     switch ( watchdogSelfTestState )
     {
         case WATCHDOG_SELF_TEST_STATE_START:
@@ -242,7 +243,11 @@
             result = SELF_TEST_STATUS_FAILED;
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_WATCHDOG_INVALID_SELF_TEST_STATE, watchdogSelfTestState )
             break;
-    }
+    }
+#else
+    watchdogSelfTestStatus = SELF_TEST_STATUS_PASSED;
+    result = watchdogSelfTestStatus;
+#endif
 
     return result;
 }