diff --git a/extended/test_ac_cycles.robot b/extended/test_ac_cycles.robot
index b8505f0..aaae01e 100644
--- a/extended/test_ac_cycles.robot
+++ b/extended/test_ac_cycles.robot
@@ -9,7 +9,7 @@
 
 Suite Setup       Open Connection And Log In
 Suite Teardown    Close All Connections
-Test Teardown     Log FFDC
+Test Teardown     FFDC On Test Case Fail
 
 *** Test Cases ***
 Test openbmc buster
diff --git a/extended/test_networkd_ext.robot b/extended/test_networkd_ext.robot
index 555e5c9..d966976 100755
--- a/extended/test_networkd_ext.robot
+++ b/extended/test_networkd_ext.robot
@@ -9,7 +9,7 @@
 
 Suite Setup         Open Connection And Log In
 Suite Teardown      Close All Connections
-Test Teardown       Log FFDC
+Test Teardown       FFDC On Test Case Fail
 
 *** Test Cases ***
 
diff --git a/extended/test_power_restore.robot b/extended/test_power_restore.robot
index 47e13aa..e6d90c4 100644
--- a/extended/test_power_restore.robot
+++ b/extended/test_power_restore.robot
@@ -13,7 +13,7 @@
 
 Library         SSHLibrary
 
-Test Teardown   Log FFDC
+Test Teardown   FFDC On Test Case Fail
 Force Tags      chassisboot  bmcreboot
 
 *** Variables ***
diff --git a/extended/test_powercycle_loop.robot b/extended/test_powercycle_loop.robot
index 786f9c1..37b991c 100644
--- a/extended/test_powercycle_loop.robot
+++ b/extended/test_powercycle_loop.robot
@@ -39,7 +39,7 @@
 
 Test Exit Logs
     Ping Host  ${OPENBMC_HOST}
-    Log FFDC
+    FFDC On Test Case Fail
 
 
 Validate Parameters
diff --git a/extended/test_syslog.robot b/extended/test_syslog.robot
index d2004c7..8be14a9 100755
--- a/extended/test_syslog.robot
+++ b/extended/test_syslog.robot
@@ -9,7 +9,7 @@
 
 Suite Setup         Open Connection And Log In
 Suite Teardown      Close All Connections
-Test Teardown       Log FFDC
+Test Teardown       FFDC On Test Case Fail
 
 
 *** Variables ***