diff --git a/redfish/managers/test_managers_bmc.robot b/redfish/managers/test_managers_bmc.robot
index 8aa917d..b64cf5a 100644
--- a/redfish/managers/test_managers_bmc.robot
+++ b/redfish/managers/test_managers_bmc.robot
@@ -2,7 +2,9 @@
 Resource         ../../lib/resource.txt
 Resource         ../../lib/bmc_redfish_resource.robot
 Resource         ../../lib/common_utils.robot
+Resource         ../../lib/openbmc_ffdc.robot
 
+Test Teardown    FFDC On Test Case Fail
 Suite Teardown   redfish.Logout
 
 *** Test Cases ***
diff --git a/redfish/service_root/test_service_root.robot b/redfish/service_root/test_service_root.robot
index a5df8c7..f6ad7ef 100644
--- a/redfish/service_root/test_service_root.robot
+++ b/redfish/service_root/test_service_root.robot
@@ -1,6 +1,9 @@
 *** Settings ***
 Resource         ../../lib/resource.txt
 Resource         ../../lib/bmc_redfish_resource.robot
+Resource         ../../lib/openbmc_ffdc.robot
+
+Test Teardown    FFDC On Test Case Fail
 
 *** Test Cases ***
 
diff --git a/redfish/service_root/test_service_root_security.robot b/redfish/service_root/test_service_root_security.robot
index 285f5da..2cd2b44 100644
--- a/redfish/service_root/test_service_root_security.robot
+++ b/redfish/service_root/test_service_root_security.robot
@@ -1,6 +1,9 @@
 *** Settings ***
 Resource         ../../lib/resource.txt
 Resource         ../../lib/bmc_redfish_resource.robot
+Resource         ../../lib/openbmc_ffdc.robot
+
+Test Teardown    FFDC On Test Case Fail
 
 *** Test Cases ***
 
diff --git a/redfish/update_service/test_firmware_inventory.robot b/redfish/update_service/test_firmware_inventory.robot
index 4e062b6..0a0c756 100644
--- a/redfish/update_service/test_firmware_inventory.robot
+++ b/redfish/update_service/test_firmware_inventory.robot
@@ -1,6 +1,9 @@
 *** Settings ***
 Resource         ../../lib/resource.txt
 Resource         ../../lib/bmc_redfish_resource.robot
+Resource         ../../lib/openbmc_ffdc.robot
+
+Test Teardown    FFDC On Test Case Fail
 
 *** Test Cases ***