diff --git a/xCAT-test/autotest/testcase/dockercommand/cases0 b/xCAT-test/autotest/testcase/dockercommand/cases0
index b3dcf2cd4..a8b4844d5 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: Container
+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=~ Error: No such container
+check:output=~$$DOCKERCN: Error
 cmd:makehosts -d $$DOCKERCN
 check:rc==0
 cmd:rmdef $$DOCKERCN
diff --git a/xCAT-test/autotest/testcase/installation/ubuntu_full_installation_vm_docker b/xCAT-test/autotest/testcase/installation/ubuntu_full_installation_vm_docker
index 4ce2ba2f6..93f912204 100644
--- a/xCAT-test/autotest/testcase/installation/ubuntu_full_installation_vm_docker
+++ b/xCAT-test/autotest/testcase/installation/ubuntu_full_installation_vm_docker
@@ -25,7 +25,6 @@ check:rc==0
 cmd:rpower $$CN boot
 check:rc==0
 
-cmd:sleep 900
 cmd:a=0;while ! `lsdef -l $$CN|grep status|grep booted >/dev/null`; do sleep 10;((a++));if [ $a -gt 60 ];then break;fi done
 
 cmd:ping $$CN -c 3
@@ -38,7 +37,8 @@ check:rc==0
 cmd:xdsh $$CN "docker -v"
 check:output=~Docker version
 check:rc==0
-cmd:xdsh $$CN "docker pull $$DOCKERIMAGE"
+
+cmd:a=0;while true; do [ $a -eq 100 ] && exit 1;xdsh $$CN "docker pull $$DOCKERIMAGE";output=$(xdsh $$CN "docker images");echo $output|grep $$DOCKERIMAGE 2>/dev/null && exit 0;a=$[$a+1];sleep 1;done
 check:rc==0
 cmd:rmdef -t osimage -o __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-dockerhost
 check:rc==0