diff --git a/extended/test_ac_cycles.robot b/extended/test_ac_cycles.robot
index de1fdfc..b8505f0 100644
--- a/extended/test_ac_cycles.robot
+++ b/extended/test_ac_cycles.robot
@@ -5,9 +5,11 @@
 Resource          ../lib/pdu/pdu.robot
 Resource          ../lib/utils.robot
 Resource          ../lib/connection_client.robot
+Resource          ../lib/openbmc_ffdc.robot
 
 Suite Setup       Open Connection And Log In
 Suite Teardown    Close All Connections
+Test Teardown     Log FFDC
 
 *** Test Cases ***
 Test openbmc buster
diff --git a/tests/security/test_ssl.robot b/tests/security/test_ssl.robot
index 0f05d9d..b15df1e 100644
--- a/tests/security/test_ssl.robot
+++ b/tests/security/test_ssl.robot
@@ -4,6 +4,8 @@
 
 Resource          ../../lib/rest_client.robot
 Resource          ../../lib/resource.txt
+Resource          ../../lib/openbmc_ffdc.robot
+Test Teardown     Log FFDC
 
 *** Test Cases ***
 Test SSL Connection
diff --git a/tests/test_association.robot b/tests/test_association.robot
index b7d456a..a2f2b92 100755
--- a/tests/test_association.robot
+++ b/tests/test_association.robot
@@ -4,12 +4,15 @@
 Resource          ../lib/rest_client.robot
 Resource          ../lib/utils.robot
 Resource          ../lib/connection_client.robot
+Resource          ../lib/openbmc_ffdc.robot
 
 Library           Collections
 
 Suite Setup       Open Connection And Log In
 Suite Teardown    Close All Connections
 
+Test Teardown     Log FFDC
+
 *** Variables ***
 
 ${SYSTEM_SHUTDOWN_TIME}           1min
diff --git a/tests/test_basic_poweron.robot b/tests/test_basic_poweron.robot
index 25500d5..e3f15ca 100644
--- a/tests/test_basic_poweron.robot
+++ b/tests/test_basic_poweron.robot
@@ -2,6 +2,8 @@
 Documentation       This module will test basic power on use cases for CI
 
 Resource            ../lib/boot/boot_resource_master.robot
+Resource            ../lib/openbmc_ffdc.robot
+Test Teardown       Log FFDC
 
 Force Tags  chassisboot
 
diff --git a/tests/test_boot.robot b/tests/test_boot.robot
index d5dd469..8eb52c2 100644
--- a/tests/test_boot.robot
+++ b/tests/test_boot.robot
@@ -2,11 +2,13 @@
 
 Documentation   This testsuite is for testing the Boot Device Functions
 
-Resource        ../lib/rest_client.robot
-Resource        ../lib/ipmi_client.robot
+Resource          ../lib/rest_client.robot
+Resource          ../lib/ipmi_client.robot
+Resource          ../lib/openbmc_ffdc.robot
 
-Suite Setup     Open Connection And Log In
-Suite Teardown  Close All Connections
+Suite Setup       Open Connection And Log In
+Suite Teardown    Close All Connections
+Test Teardown     Log FFDC
 
 *** Test Cases ***
 
diff --git a/tests/test_bootpolicy.robot b/tests/test_bootpolicy.robot
index 51c1f54..f02590e 100644
--- a/tests/test_bootpolicy.robot
+++ b/tests/test_bootpolicy.robot
@@ -5,9 +5,11 @@
 Resource           ../lib/rest_client.robot
 Resource           ../lib/ipmi_client.robot
 Resource           ../lib/utils.robot
+Resource          ../lib/openbmc_ffdc.robot
 
 Suite Setup        Open Connection And Log In
 Suite Teardown     Close All Connections
+Test Teardown      Log FFDC
 
 *** Variables ***
 
diff --git a/tests/test_esel.robot b/tests/test_esel.robot
index 50c9267..9aa9756 100644
--- a/tests/test_esel.robot
+++ b/tests/test_esel.robot
@@ -2,10 +2,12 @@
 
 Documentation   This suite is for testing esel's mechanism of checking Reservation_ID.
 
-Resource        ../lib/ipmi_client.robot
+Resource          ../lib/ipmi_client.robot
+Resource          ../lib/openbmc_ffdc.robot
 
 Suite Setup            Open Connection And Log In
 Suite Teardown         Close All Connections
+Test Teardown          Log FFDC
 
 *** Test Cases ***
 
diff --git a/tests/test_eventlog.robot b/tests/test_eventlog.robot
index c2f5b25..fbf6e3e 100644
--- a/tests/test_eventlog.robot
+++ b/tests/test_eventlog.robot
@@ -5,11 +5,13 @@
 Resource          ../lib/rest_client.robot
 Resource          ../lib/utils.robot
 Resource          ../lib/connection_client.robot
+Resource          ../lib/openbmc_ffdc.robot
 
 Library           Collections
 
 Suite Setup       Open Connection And Log In
 Suite Teardown    Close All Connections
+Test Teardown     Log FFDC
 
 *** Variables ***
 &{NIL}  data=@{EMPTY}
diff --git a/tests/test_fan.robot b/tests/test_fan.robot
index dfb9502..17ad1fa 100644
--- a/tests/test_fan.robot
+++ b/tests/test_fan.robot
@@ -2,6 +2,8 @@
 Documentation     This testsuite is for testing fan interface for openbmc
 Suite Teardown    Delete All Sessions
 Resource          ../lib/rest_client.robot
+Resource          ../lib/openbmc_ffdc.robot
+Test Teardown     Log FFDC
 
 *** Test Cases ***
 Test place holder dummy
diff --git a/tests/test_fw_version.robot b/tests/test_fw_version.robot
index cf384b4..953aa4f 100755
--- a/tests/test_fw_version.robot
+++ b/tests/test_fw_version.robot
@@ -3,6 +3,8 @@
 ...                 of system inventory
 
 Resource            ../lib/rest_client.robot
+Resource            ../lib/openbmc_ffdc.robot
+Test Teardown       Log FFDC
 
 
 *** Variables ***
diff --git a/tests/test_generic_conf.robot b/tests/test_generic_conf.robot
index 94a9fa1..b27d32a 100755
--- a/tests/test_generic_conf.robot
+++ b/tests/test_generic_conf.robot
@@ -1,9 +1,11 @@
 *** Settings ***
-Documentation		This suite will verifiy the Generic Configuration Rest Interfaces
-...					Details of valid interfaces can be found here...
-...					https://github.com/openbmc/docs/blob/master/rest-api.md
+Documentation  This suite will verifiy the Generic Configuration Rest Interfaces
+...            Details of valid interfaces can be found here...
+...            https://github.com/openbmc/docs/blob/master/rest-api.md
 
-Resource		../lib/rest_client.robot
+Resource          ../lib/rest_client.robot
+Resource          ../lib/openbmc_ffdc.robot
+Test Teardown     Log FFDC
 
 
 *** Variables ***
diff --git a/tests/test_inventory.robot b/tests/test_inventory.robot
index e851931..3ebaf8a 100644
--- a/tests/test_inventory.robot
+++ b/tests/test_inventory.robot
@@ -3,9 +3,11 @@
 Suite Teardown    Delete All Sessions
 Resource          ../lib/rest_client.robot
 Resource          ../lib/utils.robot
+Resource          ../lib/openbmc_ffdc.robot
 Library           ../lib/utilities.py
 Library           String
 Library           Collections
+Test Teardown     Log FFDC
 
 Variables         ../data/variables.py
 
diff --git a/tests/test_led.robot b/tests/test_led.robot
index 8ca04fc..bc7cc6a 100644
--- a/tests/test_led.robot
+++ b/tests/test_led.robot
@@ -5,6 +5,8 @@
 
 Resource          ../lib/rest_client.robot
 Resource          ../lib/resource.txt
+Resource          ../lib/openbmc_ffdc.robot
+Test Teardown     Log FFDC
 
 *** Variables ***
 
diff --git a/tests/test_networkd.robot b/tests/test_networkd.robot
index d4076f5..973e590 100755
--- a/tests/test_networkd.robot
+++ b/tests/test_networkd.robot
@@ -6,10 +6,12 @@
 Resource            ../lib/rest_client.robot
 Resource            ../lib/connection_client.robot
 Resource            ../lib/utils.robot
+Resource            ../lib/openbmc_ffdc.robot
 Library             ../lib/pythonutil.py
 
 Suite Setup         Open Connection And Log In
 Suite Teardown      Close All Connections
+Test Teardown       Log FFDC
 
 *** Test Cases ***
 
diff --git a/tests/test_obmcrest.robot b/tests/test_obmcrest.robot
index 92d63f9..6fd246a 100644
--- a/tests/test_obmcrest.robot
+++ b/tests/test_obmcrest.robot
@@ -3,7 +3,9 @@
 ...					Details of valid interfaces can be found here...
 ...					https://github.com/openbmc/docs/blob/master/rest-api.md
 
-Resource		../lib/rest_client.robot
+Resource	  	  ../lib/rest_client.robot
+Resource          ../lib/openbmc_ffdc.robot
+Test Teardown     Log FFDC
 
 
 *** Variables ***
@@ -371,4 +373,4 @@
     : FOR    ${ELEMENT}    IN    @{jsondata["data"]}
     \   log     ${ELEMENT}
     \   ${found}=   Get Lines Matching Pattern      ${ELEMENT}      *control/power*
-    \   Return From Keyword If     '${found}' != ''     ${found}
\ No newline at end of file
+    \   Return From Keyword If     '${found}' != ''     ${found}
diff --git a/tests/test_occ_powercap.robot b/tests/test_occ_powercap.robot
index ee72a4f..5350715 100644
--- a/tests/test_occ_powercap.robot
+++ b/tests/test_occ_powercap.robot
@@ -4,8 +4,10 @@
 Resource                ../lib/rest_client.robot
 Resource                ../lib/resource.txt
 Resource                ../lib/utils.robot
+Resource                ../lib/openbmc_ffdc.robot
 
 Suite Setup            Initiate Power On
+Test Teardown          Log FFDC
 
 *** Test Cases ***
 
diff --git a/tests/test_openbmc_service_restart_policy.robot b/tests/test_openbmc_service_restart_policy.robot
index 845958f..1a1490d 100644
--- a/tests/test_openbmc_service_restart_policy.robot
+++ b/tests/test_openbmc_service_restart_policy.robot
@@ -4,9 +4,11 @@
 
 Resource             ../lib/resource.txt
 Resource             ../lib/connection_client.robot
+Resource             ../lib/openbmc_ffdc.robot
 
 Suite Setup          Open Connection And Log In
 Suite Teardown       Close All Connections
+Test Teardown        Log FFDC
 
 *** Test Cases ***
 Test OpenBMC Services Autorestart Policy
diff --git a/tests/test_power_restore.robot b/tests/test_power_restore.robot
index 35955a2..b2632fe 100644
--- a/tests/test_power_restore.robot
+++ b/tests/test_power_restore.robot
@@ -6,10 +6,12 @@
 Resource        ../lib/rest_client.robot
 Resource        ../lib/pdu/pdu.robot
 Resource        ../lib/utils.robot
+Resource        ../lib/openbmc_ffdc.robot
 
 
 Library         SSHLibrary
 
+Test Teardown   Log FFDC
 Force Tags      chassisboot  bmcreboot
 
 ***test cases***
diff --git a/tests/test_sensors.robot b/tests/test_sensors.robot
index d301cd9..213d22f 100644
--- a/tests/test_sensors.robot
+++ b/tests/test_sensors.robot
@@ -7,10 +7,12 @@
 
 Resource        ../lib/rest_client.robot
 Resource        ../lib/ipmi_client.robot
+Resource        ../lib/openbmc_ffdc.robot
 Library         ../data/model.py
 
 Suite Setup            Open Connection And Log In
 Suite Teardown         Close All Connections
+Test Teardown          Log FFDC
 
 
 *** Variables ***
diff --git a/tests/test_syslog.robot b/tests/test_syslog.robot
index a98fd7f..d2004c7 100755
--- a/tests/test_syslog.robot
+++ b/tests/test_syslog.robot
@@ -5,9 +5,11 @@
 Resource            ../lib/rest_client.robot
 Resource            ../lib/utils.robot
 Resource            ../lib/connection_client.robot
+Resource            ../lib/openbmc_ffdc.robot
 
 Suite Setup         Open Connection And Log In
 Suite Teardown      Close All Connections
+Test Teardown       Log FFDC
 
 
 *** Variables ***
diff --git a/tests/test_time.robot b/tests/test_time.robot
index f0c0fb3..16d163c 100755
--- a/tests/test_time.robot
+++ b/tests/test_time.robot
@@ -2,12 +2,14 @@
 Documentation          This suite is for testing System time in Open BMC.
 
 Resource               ../lib/ipmi_client.robot
+Resource               ../lib/openbmc_ffdc.robot
 
 Library                OperatingSystem
 Library                DateTime
 
 Suite Setup            Open Connection And Log In
 Suite Teardown         Close All Connections
+Test Teardown          Log FFDC
 
 *** Variables ***
 ${SYSTEM_TIME_INVALID}     01/01/1969 00:00:00
diff --git a/tests/test_user.robot b/tests/test_user.robot
index 14de2df..e28fedb 100755
--- a/tests/test_user.robot
+++ b/tests/test_user.robot
@@ -4,10 +4,12 @@
 
 Resource            ../lib/rest_client.robot
 Resource            ../lib/utils.robot
+Resource            ../lib/openbmc_ffdc.robot
 
 Library             OperatingSystem
 Library             SSHLibrary
 Library             String
+Test Teardown       Log FFDC
 
 *** Variables ***
 ${RANDOM_STRING_LENGTH}    ${8}
diff --git a/tests/test_warmreset.robot b/tests/test_warmreset.robot
index 352ddf8..0d999ec 100644
--- a/tests/test_warmreset.robot
+++ b/tests/test_warmreset.robot
@@ -4,11 +4,13 @@
 Resource                ../lib/rest_client.robot
 Resource                ../lib/utils.robot
 Resource                ../lib/connection_client.robot
+Resource                ../lib/openbmc_ffdc.robot
 
 Force Tags  bmcreboot
 
 Suite Setup             Open Connection And Log In
 Suite Teardown          Close All Connections
+Test Teardown           Log FFDC
 
 *** Variables ***
 ${SYSTEM_SHUTDOWN_TIME}    ${5}