diff --git a/lib/openbmc_ffdc.robot b/lib/openbmc_ffdc.robot
index b8dc73b..aa7c3b2 100755
--- a/lib/openbmc_ffdc.robot
+++ b/lib/openbmc_ffdc.robot
@@ -7,25 +7,25 @@
 ...                logs
 ...                ├── 20160909102538035251_TestWarmreset
 ...                │   └── 20160909102538035251_TestWarmResetviaREST
-...                │       ├── 20160909102538035251_BMC_journalctl
-...                │       ├── 20160909102538035251_BMC_proc_list
-...                │       ├── 20160909102538035251_BMC_dmesg
-...                │       ├── 20160909102538035251_BMC_inventory
-...                │       ├── 20160909102538035251_BMC_led
-...                │       ├── 20160909102538035251_BMC_record_log
-...                │       ├── 20160909102538035251_BMC_sensor_list
+...                │       ├── 20160909102538035251_BMC_journalctl.txt
+...                │       ├── 20160909102538035251_BMC_proc_list.txt
+...                │       ├── 20160909102538035251_BMC_dmesg.txt
+...                │       ├── 20160909102538035251_BMC_inventory.txt
+...                │       ├── 20160909102538035251_BMC_led.txt
+...                │       ├── 20160909102538035251_BMC_record_log.txt
+...                │       ├── 20160909102538035251_BMC_sensor_list.txt
 ...                │       ├── 20160909102538035251_BMC_general.txt
-...                │       ├── 20160909102538035251_OS_dmesg
-...                │       ├── 20160909102538035251_OS_msglog
-...                │       ├── 20160909102538035251_OS_cpufrequency
-...                │       ├── 20160909102538035251_OS_boot
-...                │       ├── 20160909102538035251_OS_isusb
-...                │       ├── 20160909102538035251_OS_kern
-...                │       ├── 20160909102538035251_OS_authlog
-...                │       ├── 20160909102538035251_OS_syslog
-...                │       ├── 20160909102538035251_OS_info
-...                │       ├── 20160909102538035251_OS_rsct
-...                │       └── 20160909102538035251_OS_secure
+...                │       ├── 20160909102538035251_OS_dmesg.txt
+...                │       ├── 20160909102538035251_OS_msglog.txt
+...                │       ├── 20160909102538035251_OS_cpufrequency.txt
+...                │       ├── 20160909102538035251_OS_boot.txt
+...                │       ├── 20160909102538035251_OS_isusb.txt
+...                │       ├── 20160909102538035251_OS_kern.txt
+...                │       ├── 20160909102538035251_OS_authlog.txt
+...                │       ├── 20160909102538035251_OS_syslog.txt
+...                │       ├── 20160909102538035251_OS_info.txt
+...                │       ├── 20160909102538035251_OS_rsct.txt
+...                │       └── 20160909102538035251_OS_secure.txt
 ...                └── test_history.txt
 
 Resource           openbmc_ffdc_methods.robot
diff --git a/lib/openbmc_ffdc_methods.robot b/lib/openbmc_ffdc_methods.robot
index 9f78ae2..f08aadd 100755
--- a/lib/openbmc_ffdc_methods.robot
+++ b/lib/openbmc_ffdc_methods.robot
@@ -108,7 +108,7 @@
 
     @{cmd_list}=      Get ffdc bmc file   ${key_index}
     :FOR  ${cmd}  IN  @{cmd_list}
-    \   ${logpath}=  Catenate  SEPARATOR=   ${LOG_PREFIX}   ${cmd[0]}
+    \   ${logpath}=  Catenate  SEPARATOR=   ${LOG_PREFIX}   ${cmd[0]}.txt
     \   Execute Command and Write FFDC  ${cmd[0]}  ${cmd[1]}   ${logpath}
 
 
@@ -146,7 +146,7 @@
 
     @{cmd_list}=  Get ffdc get request  ${key_index}
     :FOR  ${cmd}  IN  @{cmd_list}
-    \   ${logpath}=  Catenate  SEPARATOR=  ${LOG_PREFIX}  ${cmd[0]}
+    \   ${logpath}=  Catenate  SEPARATOR=  ${LOG_PREFIX}  ${cmd[0]}.txt
     \   ${resp}=  OpenBMC Get Request  ${cmd[1]}
     \   ${status}=    Run Keyword and Return Status
     ...   Should Be Equal As Strings    ${resp.status_code}    ${HTTP_OK}
@@ -171,7 +171,7 @@
 
     @{cmd_list}=  get ffdc os all distros call  ${key_index}
     :FOR  ${cmd}  IN  @{cmd_list}
-    \   ${logpath}=  Catenate  SEPARATOR=  ${LOG_PREFIX}  ${cmd[0]}
+    \   ${logpath}=  Catenate  SEPARATOR=  ${LOG_PREFIX}  ${cmd[0]}.txt
     \   Execute Command and Write FFDC  ${cmd[0]}  ${cmd[1]}   ${logpath}
 
 
@@ -183,7 +183,7 @@
 
     @{cmd_list}=  get ffdc os distro call  ${key_index}  ${linux_distro}
     :FOR  ${cmd}  IN  @{cmd_list}
-    \   ${logpath}=  Catenate  SEPARATOR=  ${LOG_PREFIX}  ${cmd[0]}
+    \   ${logpath}=  Catenate  SEPARATOR=  ${LOG_PREFIX}  ${cmd[0]}.txt
     \   Execute Command and Write FFDC  ${cmd[0]}  ${cmd[1]}   ${logpath}