diff --git a/xCAT-test/autotest/testcase/dockercommand/cases0 b/xCAT-test/autotest/testcase/dockercommand/cases0
index e28c5d629..4baaa725b 100644
--- a/xCAT-test/autotest/testcase/dockercommand/cases0
+++ b/xCAT-test/autotest/testcase/dockercommand/cases0
@@ -122,7 +122,7 @@ cmd:mkdocker  $$DOCKERCN image=$$DOCKERIMAGE command=$$DOCKERCOMMAND dockerflag=
 check:rc==0
 cmd:rpower $$DOCKERCN pause
 check:rc!=0
-check:output=~$$DOCKERCN: Error 
+check:output=~$$DOCKERCN: (\[.*?\]: )?Error
 cmd:rpower $$DOCKERCN start
 check:rc==0
 cmd:rpower $$DOCKERCN pause
@@ -223,7 +223,7 @@ cmd:rmdocker $$DOCKERCN
 check:rc==0
 cmd:lsdocker -l $$DOCKERCN
 check:rc!=0
-check:output=~$$DOCKERCN: Error
+check:output=~$$DOCKERCN: (\[.*?\]: )?Error
 cmd:makehosts -d $$DOCKERCN
 check:rc==0
 cmd:rmdef $$DOCKERCN
diff --git a/xCAT-test/autotest/testcase/mkdef/cases0 b/xCAT-test/autotest/testcase/mkdef/cases0
index af33335c1..968783972 100644
--- a/xCAT-test/autotest/testcase/mkdef/cases0
+++ b/xCAT-test/autotest/testcase/mkdef/cases0
@@ -212,10 +212,10 @@ cmd:result=`lsdef | grep  auto_test_node`; if [[ $result =~ "auto_test_node" ]];
 cmd:result=`lsdef | grep  auto_test_invalid_template`; if [[ $result =~ "auto_test_invalid_template" ]]; then echo $result; noderm auto_test_invalid_template; fi
 cmd:lsdef --template auto_test_invalid_template
 check:rc==1
-check:output=~Error\: Could not find auto\_test\_invalid\_template in xCAT templates
+check:output=~Error\: (\[.*?\]: )?Could not find auto\_test\_invalid\_template in xCAT templates
 cmd:mkdef -t node -o auto_test_node --template auto_test_invalid_template
 check:rc==1
-check:output=~Error\: Could not find the template object named \'auto\_test\_invalid\_template\' of type \'node\'
+check:output=~Error\: (\[.*?\]: )?Could not find the template object named \'auto\_test\_invalid\_template\' of type \'node\'
 end
 
 start:mkdef_node_with_a_node_template
@@ -255,13 +255,13 @@ description:create a node with cec template step by step
 cmd:result=`lsdef | grep  auto_test_cec_node_1`; if [[ $result =~ "auto_test_cec_node_1" ]]; then echo $result; noderm auto_test_cec_node_1; fi
 cmd:mkdef -t node -o auto_test_cec_node_1 --template cec-template
 check:rc==1
-check:output=~Error\: The attribute \"serial\" must be specified!
+check:output=~Error\: (\[.*?\]: )?The attribute \"serial\" must be specified!
 cmd:mkdef -t node -o auto_test_cec_node_1 --template cec-template serial=test
 check:rc==1
-check:output=~Error\: The attribute \"mtm\" must be specified!
+check:output=~Error\: (\[.*?\]: )?The attribute \"mtm\" must be specified!
 cmd:mkdef -t node -o auto_test_cec_node_1 --template cec-template serial=test mtm=test
 check:rc==1
-check:output=~Error\: The attribute \"hcp\" must be specified!
+check:output=~Error\: (\[.*?\]: )?The attribute \"hcp\" must be specified!
 cmd:mkdef -t node -o auto_test_cec_node_1 --template cec-template serial=test mtm=test hcp=test
 check:rc==0
 check:output=~1 object definitions have been created or modified
diff --git a/xCAT-test/autotest/testcase/rsetboot/cases0 b/xCAT-test/autotest/testcase/rsetboot/cases0
index 960f69261..1520b3699 100644
--- a/xCAT-test/autotest/testcase/rsetboot/cases0
+++ b/xCAT-test/autotest/testcase/rsetboot/cases0
@@ -103,10 +103,10 @@ cmd:if [[ -f /tmp/rsetboot.stat ]];then mv -f /tmp/rsetboot.stat /tmp/rsetboot.s
 check:rc==0
 cmd:rsetboot $$CN,testnode net
 check:output=~$$CN: Network
-check:output=~testnode: Error
+check:output=~testnode: (\[.*?\]: )?Error
 cmd:rsetboot $$CN,testnode stat
 check:output=~$$CN: Network
-check:output=~testnode: Error
+check:output=~testnode: (\[.*?\]: )?Error
 cmd:if [[ `grep CD /tmp/rsetboot.stat` ]];then rsetboot $$CN cd;elif [[ `grep  Network /tmp/rsetboot.stat` ]];then rsetboot $$CN  net;else  rsetboot $$CN hd;fi
 check:rc==0
 cmd:if [[ -f /tmp/rsetboot.stat.bak ]];then mv -f /tmp/rsetboot.stat.bak /tmp/rsetboot.stat;else rm -rf /tmp/rsetboot.stat;fi
diff --git a/xCAT-test/autotest/testcase/snpool/cfg_wrong_cn_in_sn_pool_tftp_sync_mode b/xCAT-test/autotest/testcase/snpool/cfg_wrong_cn_in_sn_pool_tftp_sync_mode
index 235fe1e6c..90344fd49 100644
--- a/xCAT-test/autotest/testcase/snpool/cfg_wrong_cn_in_sn_pool_tftp_sync_mode
+++ b/xCAT-test/autotest/testcase/snpool/cfg_wrong_cn_in_sn_pool_tftp_sync_mode
@@ -147,7 +147,7 @@ cmd:chdef compute1 mac=
 check:rc==0
 cmd:nodeset compute1 osimage=__GETNODEATTR($$SN,os)__-__GETNODEATTR($$SN,arch)__-install-compute
 check:rc!=0
-check:output=~compute1: Error
+check:output=~compute1: (\[.*?\]: )?Error
 
 cmd:noderm compute1
 check:rc==0