diff --git a/xCAT-test/autotest/testcase/installation/Diskless_installation_flat_p8_le b/xCAT-test/autotest/testcase/installation/Diskless_installation_flat_p8_le
index 6b1370248..0e95955f5 100644
--- a/xCAT-test/autotest/testcase/installation/Diskless_installation_flat_p8_le
+++ b/xCAT-test/autotest/testcase/installation/Diskless_installation_flat_p8_le
@@ -1,5 +1,6 @@
 start:Diskless_installation_flat_p8_le
 os:Linux
+stop:yes
 
 cmd:copycds $$ISO
 check:rc==0
diff --git a/xCAT-test/autotest/testcase/installation/Full_installation_flat_p8_le b/xCAT-test/autotest/testcase/installation/Full_installation_flat_p8_le
index dd608e4b2..579f583f9 100644
--- a/xCAT-test/autotest/testcase/installation/Full_installation_flat_p8_le
+++ b/xCAT-test/autotest/testcase/installation/Full_installation_flat_p8_le
@@ -1,5 +1,6 @@
 start:Full_installation_flat_p8_le
 os:Linux
+stop:yes
 
 cmd:copycds $$ISO
 check:rc==0
@@ -20,7 +21,7 @@ check:rc==0
 cmd:rpower $$CN boot
 check:rc==0
 cmd:sleep 300
-cmd:a=0;while ! `lsdef -l $$CN|grep status|grep booted >/dev/null`; do sleep 10;((a++));if [ $a -gt 300 ];then break;fi done
+cmd:a=0;while ! `lsdef -l $$CN|grep status|grep booted >/dev/null`; do sleep 60;((a++));if [ $a -gt 50 ];then break;fi done
 cmd:ping $$CN -c 3
 check:output=~64 bytes from $$CN
 cmd:lsdef -l $$CN | grep status
diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_hierarchy b/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_hierarchy
index ef0b19a63..e2d918bff 100644
--- a/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_hierarchy
+++ b/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_hierarchy
@@ -1,5 +1,6 @@
 start:reg_linux_diskfull_installation_hierarchy
 os:Linux
+stop:yes
 
 cmd:chdef -t node -o $$CN servicenode=$$SN monserver=$$SN nfsserver=$$SN tftpserver=$$SN  xcatmaster=$$SN
 check:rc==0
@@ -42,7 +43,7 @@ cmd:if [[ "__GETNODEATTR($$CN,arch)__" =~ "ppc" ]]; then sleep 120;elif [[ "__GE
 #check:rc==0
 #check:output!~booted
 
-cmd:a=0;while ! `lsdef -l $$CN|grep status|grep booted >/dev/null`; do sleep 10;((a++));if [ $a -gt 300 ];then break;fi done
+cmd:a=0;while ! `lsdef -l $$CN|grep status|grep booted >/dev/null`; do sleep 60;((a++));if [ $a -gt 50 ];then break;fi done
 
 cmd:ping $$CN -c 3
 check:rc==0
diff --git a/xCAT-test/autotest/testcase/migration/redhat_migration b/xCAT-test/autotest/testcase/migration/redhat_migration
index 82130cec0..a40c4f13a 100644
--- a/xCAT-test/autotest/testcase/migration/redhat_migration
+++ b/xCAT-test/autotest/testcase/migration/redhat_migration
@@ -1,111 +1,7 @@
 start:redhat_migration1
 os:Linux
-#cmd:if ping -c 1 $$SN > /dev/null;then rpower $$SN off > /dev/null;fi
-#cmd:chdef -t node -o $$CN servicenode= monserver=$$MN nfsserver=$$MN tftpserver=$$MN  xcatmaster=$$MN
-#check:rc==0
-cmd:if [ "__GETNODEATTR($$CN,arch)__" != "ppc64"  -a  "__GETNODEATTR($$CN,mgt)__" != "ipmi" ];then rmvm $$CN -f -p  &&  mkvm $$CN -s 20G; fi
-cmd:rscan __GETNODEATTR($$CN,hcp)__ -w
-check:rc==0
-cmd:makedns -n
-check:rc==0
-cmd:service named restart
-check:rc==0
-cmd:makeconservercf $$CN
-check:rc==0
-cmd:cat /etc/conserver.cf | grep $$CN
-check:output=~$$CN
-cmd:sleep 60
-cmd:if [ "__GETNODEATTR($$CN,arch)__" = "ppc64" -a  "__GETNODEATTR($$CN,mgt)__" != "ipmi" ]; then getmacs -D $$CN; fi
-check:rc==0
-cmd:makedhcp -n
-check:rc==0
-cmd:makedhcp -a
-check:rc==0
-cmd:service dhcpd restart
-check:rc==0
-cmd:if cat /etc/*release |grep SUSE >/dev/null;then cat /var/lib/dhcp/db/dhcpd.leases|grep $$CN;elif cat /etc/*release |grep "Red Hat" >/dev/null;then cat /var/lib/dhcpd/dhcpd.leases|grep $$CN;fi
-check:output=~$$CN
-cmd:copycds $$ISO
-check:rc==0
-cmd:nodeset $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute
-check:rc==0
-cmd:lsdef $$CN |grep provmethod
-check:rc==0
-check:output=~__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute
-cmd:if [[ "__GETNODEATTR($$CN,mgt)__" = "ipmi" ]]; then rsetboot $$CN net; fi
-check:rc==0
-cmd:if [ "__GETNODEATTR($$CN,mgt)__" != "ipmi" ];then if [ "__GETNODEATTR($$CN,arch)__" = "ppc64" ];then rnetboot $$CN;else rpower $$CN boot;fi else rpower $$CN boot;fi
-check:rc==0
-cmd:sleep 600
-cmd:lsdef -l $$CN | grep status
-cmd:a=0;while ! `lsdef -l $$CN|grep status|grep booted >/dev/null`; do sleep 10;((a++));if [ $a -gt 300 ];then break;fi done
-cmd:ping $$CN -c 3
-check:output=~64 bytes from $$CN
-cmd:lsdef -l $$CN | grep status
-check:output=~booted
-cmd:xdsh $$CN date
-check:rc==0
-check:output=~\d\d:\d\d:\d\d
-cmd:xdsh $$CN "rm -rf /oldxcat"
-cmd:xdsh $$CN "mkdir -p /oldxcat"
-check:rc==0
-cmd:xdsh $$CN "yum -y install bzip2"
-check:rc==0
-cmd:xdsh $$CN "cd /oldxcat;wget $$MIGRATION2_DEP"
-check:rc==0
-cmd:xdsh $$CN "cd /oldxcat;wget $$MIGRATION2_CORE"
-check:rc==0
-cmd:xdsh $$CN "tar -jxvf /oldxcat/xcat-dep* -C /oldxcat"
-check:rc==0
-cmd:xdsh $$CN "tar -jxvf /oldxcat/xcat-core* -C /oldxcat"
-check:rc==0
-cmd:xdsh $$CN "/oldxcat/xcat-core/mklocalrepo.sh"
-check:rc==0
-cmd:xdsh $$CN "cd /oldxcat/xcat-dep/rh`more /etc/*release|grep VERSION_ID|cut -c13`/__GETNODEATTR($$CN,arch)__/;./mklocalrepo.sh"
-check:rc==0
-cmd:xdsh $$CN "yum clean all;yum -y install xCAT"
-check:rc==0
-cmd:xdsh $$CN "source /etc/profile.d/xcat.sh"
-check:rc==0
-cmd:xdsh $$CN "lsxcatd -v"
-check:rc==0
-check:output=~$$MIGRATION2_VERSION
-cmd:xdsh $$CN "service xcatd status"
-check:rc==0
-check:output=~running
-cmd:xdsh $$CN "chdef -t node -o node0001  nodetype=osi groups=linux"
-check:rc==0
-cmd:xdsh $$CN "lsdef"
-check:output=~node0001
-cmd:check==0
-cmd:xdsh $$CN "cd /; scp -r $$MN:/core-rpms-snap.tar.bz2 /"
-check:rc==0
-cmd:xdsh $$CN "cd /; scp -r $$MN:/xcat-dep*.tar.bz2 /"
-check:rc==0
-cmd:xdsh $$CN "tar -jxf /core-rpms-snap.tar.bz2"
-check:rc==0
-cmd:xdsh $$CN "cd /root/xcat-core;./mklocalrepo.sh"
-check:rc==0
-cmd:xdsh $$CN "tar -jxvf /xcat-dep*.tar.bz2"
-check:rc==0
-cmd:xdsh $$CN "cd /root/xcat-dep/rh`more /etc/*release|grep VERSION_ID|cut -c13`/__GETNODEATTR($$CN,arch)__/;./mklocalrepo.sh"
-check:rc==0
-cmd:xdsh $$CN "yum clean metadata;yum -y update '*xCAT*'"
-check:rc==0
-cmd:xdsh $$CN "service xcatd status"
-check:rc==0
-check:output=~running
-cmd:xdsh $$CN "lsdef"
-check:output=~node0001
-cmd:xdsh $$CN "noderm node0001"
-check:rc==0
-cmd:xdsh $$CN "lsxcatd -v"
-check:rc==0
-check:output=~$$LATEST_VERSION
-end
+stop:yes
 
-start:redhat_migration2
-os:Linux
 #cmd:if ping -c 1 $$SN > /dev/null;then rpower $$SN off > /dev/null;fi
 #cmd:chdef -t node -o $$CN servicenode= monserver=$$MN nfsserver=$$MN tftpserver=$$MN  xcatmaster=$$MN
 #check:rc==0
@@ -210,3 +106,111 @@ check:rc==0
 check:output=~$$LATEST_VERSION
 end
 
+start:redhat_migration2
+os:Linux
+stop:yes
+
+#cmd:if ping -c 1 $$SN > /dev/null;then rpower $$SN off > /dev/null;fi
+#cmd:chdef -t node -o $$CN servicenode= monserver=$$MN nfsserver=$$MN tftpserver=$$MN  xcatmaster=$$MN
+#check:rc==0
+cmd:if [ "__GETNODEATTR($$CN,arch)__" != "ppc64"  -a  "__GETNODEATTR($$CN,mgt)__" != "ipmi" ];then rmvm $$CN -f -p  &&  mkvm $$CN -s 20G; fi
+cmd:rscan __GETNODEATTR($$CN,hcp)__ -w
+check:rc==0
+cmd:makedns -n
+check:rc==0
+cmd:service named restart
+check:rc==0
+cmd:makeconservercf $$CN
+check:rc==0
+cmd:cat /etc/conserver.cf | grep $$CN
+check:output=~$$CN
+cmd:sleep 60
+cmd:if [ "__GETNODEATTR($$CN,arch)__" = "ppc64" -a  "__GETNODEATTR($$CN,mgt)__" != "ipmi" ]; then getmacs -D $$CN; fi
+check:rc==0
+cmd:makedhcp -n
+check:rc==0
+cmd:makedhcp -a
+check:rc==0
+cmd:service dhcpd restart
+check:rc==0
+cmd:if cat /etc/*release |grep SUSE >/dev/null;then cat /var/lib/dhcp/db/dhcpd.leases|grep $$CN;elif cat /etc/*release |grep "Red Hat" >/dev/null;then cat /var/lib/dhcpd/dhcpd.leases|grep $$CN;fi
+check:output=~$$CN
+cmd:copycds $$ISO
+check:rc==0
+cmd:nodeset $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute
+check:rc==0
+cmd:lsdef $$CN |grep provmethod
+check:rc==0
+check:output=~__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute
+cmd:if [[ "__GETNODEATTR($$CN,mgt)__" = "ipmi" ]]; then rsetboot $$CN net; fi
+check:rc==0
+cmd:if [ "__GETNODEATTR($$CN,mgt)__" != "ipmi" ];then if [ "__GETNODEATTR($$CN,arch)__" = "ppc64" ];then rnetboot $$CN;else rpower $$CN boot;fi else rpower $$CN boot;fi
+check:rc==0
+cmd:sleep 600
+cmd:lsdef -l $$CN | grep status
+cmd:a=0;while ! `lsdef -l $$CN|grep status|grep booted >/dev/null`; do sleep 10;((a++));if [ $a -gt 300 ];then break;fi done
+cmd:ping $$CN -c 3
+check:output=~64 bytes from $$CN
+cmd:lsdef -l $$CN | grep status
+check:output=~booted
+cmd:xdsh $$CN date
+check:rc==0
+check:output=~\d\d:\d\d:\d\d
+cmd:xdsh $$CN "rm -rf /oldxcat"
+cmd:xdsh $$CN "mkdir -p /oldxcat"
+check:rc==0
+cmd:xdsh $$CN "yum -y install bzip2"
+check:rc==0
+cmd:xdsh $$CN "cd /oldxcat;wget $$MIGRATION2_DEP"
+check:rc==0
+cmd:xdsh $$CN "cd /oldxcat;wget $$MIGRATION2_CORE"
+check:rc==0
+cmd:xdsh $$CN "tar -jxvf /oldxcat/xcat-dep* -C /oldxcat"
+check:rc==0
+cmd:xdsh $$CN "tar -jxvf /oldxcat/xcat-core* -C /oldxcat"
+check:rc==0
+cmd:xdsh $$CN "/oldxcat/xcat-core/mklocalrepo.sh"
+check:rc==0
+cmd:xdsh $$CN "cd /oldxcat/xcat-dep/rh`more /etc/*release|grep VERSION_ID|cut -c13`/__GETNODEATTR($$CN,arch)__/;./mklocalrepo.sh"
+check:rc==0
+cmd:xdsh $$CN "yum clean all;yum -y install xCAT"
+check:rc==0
+cmd:xdsh $$CN "source /etc/profile.d/xcat.sh"
+check:rc==0
+cmd:xdsh $$CN "lsxcatd -v"
+check:rc==0
+check:output=~$$MIGRATION2_VERSION
+cmd:xdsh $$CN "service xcatd status"
+check:rc==0
+check:output=~running
+cmd:xdsh $$CN "chdef -t node -o node0001  nodetype=osi groups=linux"
+check:rc==0
+cmd:xdsh $$CN "lsdef"
+check:output=~node0001
+cmd:check==0
+cmd:xdsh $$CN "cd /; scp -r $$MN:/core-rpms-snap.tar.bz2 /"
+check:rc==0
+cmd:xdsh $$CN "cd /; scp -r $$MN:/xcat-dep*.tar.bz2 /"
+check:rc==0
+cmd:xdsh $$CN "tar -jxf /core-rpms-snap.tar.bz2"
+check:rc==0
+cmd:xdsh $$CN "cd /root/xcat-core;./mklocalrepo.sh"
+check:rc==0
+cmd:xdsh $$CN "tar -jxvf /xcat-dep*.tar.bz2"
+check:rc==0
+cmd:xdsh $$CN "cd /root/xcat-dep/rh`more /etc/*release|grep VERSION_ID|cut -c13`/__GETNODEATTR($$CN,arch)__/;./mklocalrepo.sh"
+check:rc==0
+cmd:xdsh $$CN "yum clean metadata;yum -y update '*xCAT*'"
+check:rc==0
+cmd:xdsh $$CN "service xcatd status"
+check:rc==0
+check:output=~running
+cmd:xdsh $$CN "lsdef"
+check:output=~node0001
+cmd:xdsh $$CN "noderm node0001"
+check:rc==0
+cmd:xdsh $$CN "lsxcatd -v"
+check:rc==0
+check:output=~$$LATEST_VERSION
+end
+