diff --git a/xCAT-probe/lib/perl/probe_utils.pm b/xCAT-probe/lib/perl/probe_utils.pm
index db96fdc24..b4df1e5f4 100644
--- a/xCAT-probe/lib/perl/probe_utils.pm
+++ b/xCAT-probe/lib/perl/probe_utils.pm
@@ -257,6 +257,7 @@ sub is_firewall_open {
         Test if http service is ready to use in current operating system
     Arguments:
         ip:  http server's ip 
+        errormsg_ref: (output attribute) if there is something wrong for HTTP service, this attribute save the possible reason.
     Returns:
         1 : yes
         0 : no
@@ -266,20 +267,69 @@ sub is_firewall_open {
 sub is_http_ready {
     my $mnip = shift;
     $mnip = shift if (($mnip) && ($mnip =~ /probe_utils/));
+    my $errormsg_ref = shift;
 
-    my $http = "http://$mnip/install/postscripts/syslog";
-    rename("./syslog", "./syslog.org") if (-e "./syslog");
+    my $http      = "http://$mnip/install/postscripts/syslog";
+    my %httperror = (
+    "400" => "The request $http could not be understood by the server due to malformed syntax",
+    "401" => "The request requires user authentication.",
+    "403" => "The server understood the request, but is refusing to fulfill it.",
+    "404" => "The server has not found anything matching the test Request-URI $http.",
+    "405" => "The method specified in the Request-Line $http is not allowe.",
+    "406" => "The method specified in the Request-Line $http is not acceptable.",
+    "407" => "The wget client must first authenticate itself with the proxy.",
+    "408" => "The client did not produce a request within the time that the server was prepared to wait. The client MAY repeat the request without modifications at any later time.",
+    "409" => "The request could not be completed due to a conflict with the current state of the resource.",
+    "410" => "The requested resource $http is no longer available at the server and no forwarding address is known.",
+    "411" => "The server refuses to accept the request without a defined Content- Length.",
+    "412" => "The precondition given in one or more of the request-header fields evaluated to false when it was tested on the server.",
+    "413" => "The server is refusing to process a request because the request entity is larger than the server is willing or able to process.",
+    "414" => "The server is refusing to service the request because the Request-URI is longer than the server is willing to interpret.",
+    "415" => "The server is refusing to service the request because the entity of the request is in a format not supported by the requested resource for the requested method.",
+    "416" => "Requested Range Not Satisfiable",
+    "417" => "The expectation given in an Expect request-header field could not be met by this server",
+    "500" => "The server encountered an unexpected condition which prevented it from fulfilling the request.",
+    "501" => "The server does not recognize the request method and is not capable of supporting it for any resource.",
+    "502" => "The server, while acting as a gateway or proxy, received an invalid response from the upstream server it accessed in attempting to fulfill the reques.",
+    "503" => "The server is currently unable to handle the request due to a temporary overloading or maintenance of the server.",
+    "504" => "The server, while acting as a gateway or proxy, did not receive a timely response from the upstream server specified by the URI or some other auxiliary server it needed to access in attempting to complete the request.",
+    "505" => "The server does not support, or refuses to support, the HTTP protocol version that was used in the request message.");
 
-    my $outputtmp = `wget $http 2>&1`;
-    my $rst       = $?;
-    if (($outputtmp =~ /200 OK/) && (!$rst) && (-e "./syslog")) {
-        unlink("./syslog");
-        rename("./syslog.org", "./syslog") if (-e "./syslog.org");
-        return 1;
-    } else {
-        rename("./syslog.org", "./syslog") if (-e "./syslog.org");
+    my $tmpdir = "/tmp/xcatprobe$$/";
+    if(! mkpath("$tmpdir")){
+        $$errormsg_ref = "Prepare test environment error: $!";
         return 0;
     }
+    my @outputtmp = `wget -O $tmpdir/syslog $http 2>&1`;
+    my $rst       = $?;
+    $rst = $rst >> 8;
+
+    if ((!$rst) && (-e "$tmpdir/syslog")) {
+        unlink("$tmpdir/syslog");
+        rmdir ("$tmpdir");
+        return 1;
+    } elsif ($rst == 4) {
+        $$errormsg_ref = "Network failure, the server refuse connection. Please check if httpd service is running first.";
+    } elsif ($rst == 5) {
+        $$errormsg_ref = "SSL verification failure, the server refuse connection";
+    } elsif ($rst == 6) {
+        $$errormsg_ref = "Username/password authentication failure, the server refuse connection";
+    } elsif ($rst == 8) {
+        my $returncode = $outputtmp[2];
+        chomp($returncode);
+        $returncode =~ s/.+(\d\d\d).+/$1/g;
+        if(exists($httperror{$returncode})){
+            $$errormsg_ref = $httperror{$returncode};
+        }else{
+            #should not hit this block normally
+            $$errormsg_ref = "Unknown return code of wget <$returncode>.";
+        }
+    }
+    unlink("$tmpdir/syslog");
+    if(! rmdir ("$tmpdir")){
+        $$errormsg_ref .= " Clean test environment error(rmdir $tmpdir): $!";
+    }
+    return 0;
 }
 
 #------------------------------------------
@@ -436,4 +486,66 @@ sub parse_node_range {
     chomp @nodeslist;
     return @nodeslist;
 }
+
+#------------------------------------------
+
+=head3
+    Description:
+        Test if ntp service is ready to use in current operating system
+    Arguments:
+        errormsg_ref: (output attribute) if there is something wrong for ntp service, this attribute save the possible reason.
+    Returns:
+        1 : yes
+        0 : no
+=cut
+
+#------------------------------------------
+sub is_ntp_ready{
+    my $errormsg_ref = shift;
+    $errormsg_ref= shift if (($errormsg_ref) && ($errormsg_ref =~ /probe_utils/));
+
+    my $cmd = 'ntpq -c "rv 0"';
+    $| = 1;
+
+    #wait 5 seconds for ntpd synchronize at most
+    for (my $i = 0; $i < 5; ++$i) {
+        if(!open(NTP, $cmd." 2>&1 |")){
+            $$errormsg_ref = "Can't start ntpq: $!";
+            return 0;
+        }else{
+            while(<NTP>) {
+                chomp;
+                if (/^associd=0 status=(\S{4}) (\S+),/) {
+                    my $leap=$2;
+
+                    last if ($leap =~ /(sync|leap)_alarm/);
+
+                    if ($leap =~ /leap_(none|((add|del)_sec))/){
+                        close(NTP);
+                        return 1;
+                    }
+
+                    #should not hit below 3 lines normally
+                    $$errormsg_ref = "Unexpected ntpq output ('leap' status <$leap>), please contact xCAT team";
+                    close(NTP);
+                    return 0;
+                }elsif(/Connection refused/) {
+                    $$errormsg_ref = "ntpd service is not running! Please setup ntp in current node";
+                    close(NTP);
+                    return 0;
+                }else{
+                    #should not hit this block normally
+                    $$errormsg_ref = "Unexpected ntpq output <$_>, please contact xCAT team";
+                    close(NTP);
+                    return 0;
+                }
+            }
+        }
+        close(NTP);
+        sleep 1;
+    }
+    $$errormsg_ref = "ntpd did not synchronize.";
+    return 0;
+}
+
 1;
diff --git a/xCAT-probe/subcmds/xcatmn b/xCAT-probe/subcmds/xcatmn
index 199262d19..9a1c212e5 100755
--- a/xCAT-probe/subcmds/xcatmn
+++ b/xCAT-probe/subcmds/xcatmn
@@ -125,6 +125,12 @@ sub do_main_job {
     print_check_result($checkpoint, "f", $rst, \@error);
     $rc |= $rst;
 
+    #check NTP service
+    $checkpoint = "NTP service works well";
+    $rst = check_ntp_service(\@error);
+    print_check_result($checkpoint, "f", $rst, \@error);
+    $rc |= $rst;
+
     #Below are the 'warning` level check points
 
     #check if firewall is close
@@ -566,8 +572,9 @@ sub check_http_service {
         push @$error_ref, "HTTP check need 'wget' tool, please install 'wget' tool and try again";
         $rst = 1;
     } else {
-        if (!probe_utils->is_http_ready("$serverip")) {
-            push @$error_ref, "HTTP service isn't ready on $serverip";
+        my $errormsg;
+        if (!probe_utils->is_http_ready("$serverip", \$errormsg)) {
+            push @$error_ref, "$errormsg";
             $rst = 1;
         }
     }
@@ -611,6 +618,26 @@ sub check_tftp_service {
     return $rst;
 }
 
+sub check_ntp_service{
+    my $error_ref = shift;
+    my $rst       = 0;
+    @$error_ref = ();
+  
+    `which ntpq > /dev/null 2>&1`;
+    if($?){
+        push @$error_ref, "ntp service check need 'ntpq' tool, please install 'ntpq' toll and try again";
+        $rst = 1;
+    }else{
+        my $error;
+        if(!probe_utils->is_ntp_ready(\$error)){
+            push @$error_ref, "$error";
+            $rst = 1;
+        }
+    }
+ 
+    return $rst; 
+}
+
 sub check_dns_service {
     my $sitetable_ref = shift;
     my $serverip      = shift;