diff --git a/systest/collection/bmc_collect_esels.robot b/systest/collection/bmc_collect_esels.robot
index 776f920..8f09307 100644
--- a/systest/collection/bmc_collect_esels.robot
+++ b/systest/collection/bmc_collect_esels.robot
@@ -23,7 +23,7 @@
 Rest Collect eSELs
     [Documentation]  Collect eSEL using the OpenBMC Rest API.
     [Tags]  Rest_Collect_eSELs  rest
-    [Teardown]  FFDC On Test Case Fail  clean_up=${FALSE}
+    [Teardown]  FFDC On Test Case Fail
 
     ${error_logs}=  Get Error Logs  ${QUIET}
     ${rest_error_logs}=  gen_robot_print.Sprint Vars  error_logs
@@ -73,4 +73,4 @@
     [Documentation]  Do the post test teardown for redfish.
 
     Redfish.Logout
-    FFDC On Test Case Fail  clean_up=${FALSE}
+    FFDC On Test Case Fail
diff --git a/systest/collection/bmc_collect_sensors.robot b/systest/collection/bmc_collect_sensors.robot
index 8862308..4ac56b6 100644
--- a/systest/collection/bmc_collect_sensors.robot
+++ b/systest/collection/bmc_collect_sensors.robot
@@ -26,7 +26,7 @@
 Rest Collect Sensors
     [Documentation]  Collect the sensors values using the OpenBMC Rest API.
     [Tags]  Rest_Collect_Sensors  rest
-    [Teardown]  FFDC On Test Case Fail  clean_up=${FALSE}
+    [Teardown]  FFDC On Test Case Fail
 
     ${sensors}=  OpenBMC Get Request  ${SENSORS_URI}enumerate
     ${sensors}=  Evaluate  $sensors.json()['data']
@@ -90,4 +90,4 @@
     [Documentation]  Do the post test teardown for redfish.
 
     Redfish.Logout
-    FFDC On Test Case Fail  clean_up=${FALSE}
+    FFDC On Test Case Fail
diff --git a/systest/collection/bmc_collect_vpd_and_hw_status.robot b/systest/collection/bmc_collect_vpd_and_hw_status.robot
index 2ce8040..e2a19c5 100644
--- a/systest/collection/bmc_collect_vpd_and_hw_status.robot
+++ b/systest/collection/bmc_collect_vpd_and_hw_status.robot
@@ -21,7 +21,7 @@
 Rest Collect VPD And Hardware Status
     [Documentation]  Collect VPD and hardware status using the OpenBMC Rest API.
     [Tags]  Rest_Collect_VPD_And_Hardware_Status  rest
-    [Teardown]  FFDC On Test Case Fail  clean_up=${FALSE}
+    [Teardown]  FFDC On Test Case Fail
 
     ${system_properties}=  OpenBMC Get Request  ${HOST_INVENTORY_URI}system
     ${system_properties}=  Evaluate  $system_properties.json()
@@ -72,4 +72,4 @@
     [Documentation]  Do the post test teardown for redfish.
 
     Redfish.Logout
-    FFDC On Test Case Fail  clean_up=${FALSE}
+    FFDC On Test Case Fail