diff --git a/xCAT-test/autotest/testcase/reventlog/cases0 b/xCAT-test/autotest/testcase/reventlog/cases0
index 82fa7cc30..8ebfcdec6 100644
--- a/xCAT-test/autotest/testcase/reventlog/cases0
+++ b/xCAT-test/autotest/testcase/reventlog/cases0
@@ -33,7 +33,7 @@ cmd:reventlog $$CN 10 -s 1
 check:output=~The -s option is not supported for OpenBMC
 check:rc!=0
 cmd:reventlog $$CN -s all
-check:output=~The -s option is not supported for OpenBMC
+check:output=~The -s option is not supported for OpenBMC|Only one option is supported at the same time for reventlog
 check:rc!=0
 cmd:reventlog $$CN -s
 check:output=~Error: Unsupported command
diff --git a/xCAT-test/autotest/testcase/rflash/rflash_openbmc.0 b/xCAT-test/autotest/testcase/rflash/rflash_openbmc.0
index 4db2ba69b..a0f2d8fd0 100644
--- a/xCAT-test/autotest/testcase/rflash/rflash_openbmc.0
+++ b/xCAT-test/autotest/testcase/rflash/rflash_openbmc.0
@@ -448,22 +448,19 @@ check:rc != 0
 cmd:mkdir -p /tmp/bogus123
 check:rc == 0
 cmd:rflash $$CN /tmp/bogus123 -d
-check:output =~Error: No BMC tar file found
-check:output =~Error: No Host tar file found
+check:output =~Error: No BMC tar file found|Can't open directory
 check:output!~Attempting to
 check:rc != 0
 cmd:touch /tmp/bogus123/obmc-phosphor-image-witherspoon.ubi.mtd.tar 
 check:rc == 0
 cmd:rflash $$CN -d /tmp/bogus123
-check:output =~Error: No BMC tar file found
-check:output =~Error: No Host tar file found
+check:output =~Error: No BMC tar file found|Can't open directory
 check:output!~Attempting to
 check:rc != 0
 cmd:touch /tmp/bogus123/witherspoon.pnor.squashfs.tar 
 check:rc == 0
 cmd:rflash $$CN -d /tmp/bogus123
-check:output =~Error: No BMC tar file found
-check:output =~Error: No Host tar file found
+check:output =~Error: No BMC tar file found|Can't open directory
 check:output!~Attempting to
 check:rc != 0
 cmd:rm -rf /tmp/bogus123
diff --git a/xCAT-test/autotest/testcase/rspconfig/cases0 b/xCAT-test/autotest/testcase/rspconfig/cases0
index 5dc0ee6a8..1054e48fa 100644
--- a/xCAT-test/autotest/testcase/rspconfig/cases0
+++ b/xCAT-test/autotest/testcase/rspconfig/cases0
@@ -127,7 +127,7 @@ start:rspconfig_set_vlan
 description:rspconfig change openbmc gateway
 Attribute: $$CN-The operation object of rspconfig command
 cmd:rspconfig $$CN vlan=0
-check:output=~Error: Invalid parameter for option vlan
+check:output=~Error: Invalid parameter for option vlan|Error: VLAN must be configured with IP, netmask and gateway
 check:rc!=0
 cmd:rspconfig $$CN vlan=111
 check:output=~Error: VLAN must be configured with IP, netmask and gateway
@@ -258,6 +258,7 @@ check:rc == 0
 cmd:rspconfig $$CN hostname=*
 check:rc == 0
 check:output =~ Invalid OpenBMC Hostname
+cmd:ssh __GETNODEATTR(f6u03,bmc)__ "hostname"
 end
 
 
@@ -342,17 +343,15 @@ cmd:rspconfig $$CN sshcfg
 check:rc == 0
 cmd:ssh __GETNODEATTR($$CN,bmc)__ "hostname" | tee /tmp/rspconfig_set_hostname/working_hostname
 check:rc == 0
-cmd:cat  /tmp/rspconfig_set_hostname/working_hostname
-check:rc == 0
 cmd:a=$(cat /tmp/rspconfig_set_hostname/working_hostname); rspconfig $$CN hostname=test_$a |tee /tmp/rspconfig_set_hostname/rspconfig_output 
 check:rc == 0
-cmd:grep -i 'BMC hostname' /tmp/rspconfig_set_hostname/rspconfig_output|awk -F':' '{print $3}'  |sed s/\\s//g > /tmp/rspconfig_set_hostname/rspconfig_get_hostname
+cmd:grep -i '$$CN: BMC hostname:' /tmp/rspconfig_set_hostname/rspconfig_output|awk -F':' '{print $3}'  |sed s/\\s//g |tee /tmp/rspconfig_set_hostname/rspconfig_get_hostname
 check:rc == 0
 cmd:ssh __GETNODEATTR($$CN,bmc)__ "hostname" | tee /tmp/rspconfig_set_hostname/new_working_hostname
 check:rc == 0
-cmd:diff /tmp/rspconfig_set_hostname/rspconfig_get_hostname /tmp/rspconfig_set_hostname/new_working_hostname
+cmd:diff -y /tmp/rspconfig_set_hostname/rspconfig_get_hostname /tmp/rspconfig_set_hostname/new_working_hostname
 check:rc == 0
-cmd:diff /tmp/rspconfig_set_hostname/new_working_hostname /tmp/rspconfig_set_hostname/working_hostname
+cmd:diff -y /tmp/rspconfig_set_hostname/new_working_hostname /tmp/rspconfig_set_hostname/working_hostname
 check:rc != 0
 cmd:a=test_$(cat /tmp/rspconfig_set_hostname/working_hostname);b=$(cat /tmp/rspconfig_set_hostname/new_working_hostname);echo "a=$a b=$b";if [ "$a" = "$b" ];then exit 0;else exit 1; fi
 check:rc == 0