Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -r74be223d47ea7bb0ac7d814e74d3627d830a5fac -rf7cdfd3256f195cd8aa06e28009cd5f26b50f08c
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 74be223d47ea7bb0ac7d814e74d3627d830a5fac)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision f7cdfd3256f195cd8aa06e28009cd5f26b50f08c)
@@ -8,7 +8,7 @@
 * @file    WatchdogMgmt.c
 *
 * @author  (last)      Sean Nash
-* @date    (last)      06-Aug-2021
+* @date    (last)      12-Nov-2021
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -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;
 }