diff --git a/xCAT-test/autotest/testcase/makentp/cases0 b/xCAT-test/autotest/testcase/makentp/cases0
index ec4c5dc2a..75a137919 100644
--- a/xCAT-test/autotest/testcase/makentp/cases0
+++ b/xCAT-test/autotest/testcase/makentp/cases0
@@ -114,11 +114,8 @@ check:output=~ntp servers are: $$extntpserversip
 check:output=~stopping ntpserver
 check:output=~starting ntpserver
 check:output=~enabling ntpserver
-cmd:if [ -f "/usr/sbin/ntp-wait" ];then ntp-wait; else sleep 1200; fi
+cmd:if [[ "__GETNODEATTR($$CN,os)__" =~ "ubuntu" ]] || [[ "__GETNODEATTR($$CN,os)__" = "sles11.4" ]];then service ntp status;else service ntpd status; fi
 check:rc==0
-cmd:ntpq -p
-check:output=~*$$extntpserversip
-cmd:grep $$extntpserversip /etc/ntpd.conf
+cmd:a=0;while ! `ntpq -n -c peers | awk '{print \$1}'|grep "*" >/dev/null`; do sleep 30;((a++));if [ $a -gt 30 ];then exit 1;fi done
 check:rc==0
 end
-