diff --git a/xCAT-test/autotest/bundle/p_rhels_cmd.bundle b/xCAT-test/autotest/bundle/p_rhels_cmd.bundle
index fc4fba710..24d98961c 100644
--- a/xCAT-test/autotest/bundle/p_rhels_cmd.bundle
+++ b/xCAT-test/autotest/bundle/p_rhels_cmd.bundle
@@ -250,13 +250,10 @@ switchdiscover_range_r
 switchdiscover_range_x
 switchdiscover_range_z
 switchdiscover_range_z_V
-nodeset_check_yaboot_no
-nodeset_check_yaboot_yes
-nodeset_check_grub2_yes
-nodeset_check_grub2_no
 makentp_v
 makentp_h
 makentp_V
 makentp
 makentp_a
 updatenode_computenode_P_setupntp
+nodeset_check_warninginfo
diff --git a/xCAT-test/autotest/bundle/p_sles_cmd.bundle b/xCAT-test/autotest/bundle/p_sles_cmd.bundle
index 8eee5eb86..24d98961c 100644
--- a/xCAT-test/autotest/bundle/p_sles_cmd.bundle
+++ b/xCAT-test/autotest/bundle/p_sles_cmd.bundle
@@ -250,11 +250,10 @@ switchdiscover_range_r
 switchdiscover_range_x
 switchdiscover_range_z
 switchdiscover_range_z_V
-nodeset_check_grub2_sles11
-nodeset_check_yaboot_sles11
 makentp_v
 makentp_h
 makentp_V
 makentp
 makentp_a
 updatenode_computenode_P_setupntp
+nodeset_check_warninginfo
diff --git a/xCAT-test/autotest/bundle/x_rhels_cmd.bundle b/xCAT-test/autotest/bundle/x_rhels_cmd.bundle
index 98e2cf065..3291a01cd 100644
--- a/xCAT-test/autotest/bundle/x_rhels_cmd.bundle
+++ b/xCAT-test/autotest/bundle/x_rhels_cmd.bundle
@@ -195,3 +195,4 @@ switchdiscover_range_r
 switchdiscover_range_x
 switchdiscover_range_z
 switchdiscover_range_z_V
+nodeset_check_warninginfo
diff --git a/xCAT-test/autotest/bundle/x_sles_cmd.bundle b/xCAT-test/autotest/bundle/x_sles_cmd.bundle
index cb88296b1..ce1de92a9 100644
--- a/xCAT-test/autotest/bundle/x_sles_cmd.bundle
+++ b/xCAT-test/autotest/bundle/x_sles_cmd.bundle
@@ -199,3 +199,4 @@ switchdiscover_range_r
 switchdiscover_range_x
 switchdiscover_range_z
 switchdiscover_range_z_V
+nodeset_check_warninginfo
diff --git a/xCAT-test/autotest/bundle/x_ubuntu_cmd.bundle b/xCAT-test/autotest/bundle/x_ubuntu_cmd.bundle
index a0a477f8f..9a4fc47a9 100644
--- a/xCAT-test/autotest/bundle/x_ubuntu_cmd.bundle
+++ b/xCAT-test/autotest/bundle/x_ubuntu_cmd.bundle
@@ -240,4 +240,4 @@ switchdiscover_range_r
 switchdiscover_range_x
 switchdiscover_range_z
 switchdiscover_range_z_V
-nodeset_check_grub2_ubuntu
+nodeset_check_warninginfo