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;
                 }