Index: firmware/App/Drivers/SafetyShutdown.c
===================================================================
diff -u -ref6283257df7c1f993d58fb934da57ea3e0a7067 -r0c439ddcf7e4d3d4bf63df679eacf2f12f01255f
--- firmware/App/Drivers/SafetyShutdown.c	(.../SafetyShutdown.c)	(revision ef6283257df7c1f993d58fb934da57ea3e0a7067)
+++ firmware/App/Drivers/SafetyShutdown.c	(.../SafetyShutdown.c)	(revision 0c439ddcf7e4d3d4bf63df679eacf2f12f01255f)
@@ -129,17 +129,16 @@
     {
         case SAFETY_SHUTDOWN_SELF_TEST_STATE_START:
         {
+            F32 v24 = getIntADCVoltageConverted( INT_ADC_24V_ACTUATORS );
+
             safetyShutdownSelfTestState = SAFETY_SHUTDOWN_SELF_TEST_STATE_IN_PROGRESS;
-#ifndef DISABLE_WD_AND_SFTY_POST_TESTS
-                F32 v24 = getIntADCVoltageConverted( INT_ADC_24V_ACTUATORS );
 
-                // Verify 24V is up
-                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_24V_INITIAL, v24 )
-                    safetyShutdownSelfTestStatus = SELF_TEST_STATUS_FAILED;
-                }
-#endif
+            // Verify 24V is up
+            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_24V_INITIAL, v24 )
+                safetyShutdownSelfTestStatus = SELF_TEST_STATUS_FAILED;
+            }
             safetyShutdownSelfTestTimerCount = getMSTimerCount();
             activateSafetyShutdown();
         }
@@ -151,14 +150,12 @@
                 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;
@@ -172,15 +169,13 @@
                 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;
                 }