diff --git a/lib/openbmc_ffdc.py b/lib/openbmc_ffdc.py
index f2d2e09..5292b79 100644
--- a/lib/openbmc_ffdc.py
+++ b/lib/openbmc_ffdc.py
@@ -82,7 +82,7 @@
     FFDC_FILE_PATH = ffdc_dir_path + ffdc_prefix + "BMC_general.txt"
     BuiltIn().set_global_variable("${FFDC_FILE_PATH}", FFDC_FILE_PATH)
 
-    status, ffdc_file_list = grk.run_key("Header Message")
+    status, ffdc_file_list = grk.run_key_u("Header Message")
     status, ffdc_file_sub_list = \
         grk.run_key_u("Call FFDC Methods  ffdc_function_list="
                       + ffdc_function_list)
diff --git a/lib/openbmc_ffdc_utils.robot b/lib/openbmc_ffdc_utils.robot
index 2dca330..9d459b8 100644
--- a/lib/openbmc_ffdc_utils.robot
+++ b/lib/openbmc_ffdc_utils.robot
@@ -71,6 +71,10 @@
     ...                 2. Add test setup and config information.
     ...                 3. Print types of data collection.
 
+
+    ${ffdc_file_list}=  Create List  ${FFDC_FILE_PATH}
+    Return From Keyword If  '${TEST_MODE}'  ${ffdc_file_list}
+
     ${TEST_NAME}=  Get Variable Value  ${TEST_NAME}
     ${TEST_MESSAGE}=  Get Variable Value  ${TEST_MESSAGE}
     ${TEST_DOCUMENTATION}=  Get Variable Value  ${TEST_DOCUMENTATION}
@@ -95,7 +99,6 @@
     \   Write Data To File  ${\n}
 
     Write Data To File  ${MSG_DETAIL}
-    ${ffdc_file_list}=  Create List  ${FFDC_FILE_PATH}
     [Return]  ${ffdc_file_list}