diff --git a/xCAT-test/autotest/bundle/p_ubunut.cmd.bundle b/xCAT-test/autotest/bundle/p_ubunut.cmd.bundle
index 09a290afa..62ffda7bc 100644
--- a/xCAT-test/autotest/bundle/p_ubunut.cmd.bundle
+++ b/xCAT-test/autotest/bundle/p_ubunut.cmd.bundle
@@ -1,14 +1,13 @@
+makehosts_h
+makehosts_help
+makehosts_n
+makehosts_n_noderange
 chdef_null
-chdef_t_node
-chdef_t_network
-chdef_p
-chdef_m
+chdef_t_o_attr
+chdef_p_t_o_attr
+chdef_m_t_o_attr
 chdef_z
-chdef_group
-chdef_group_p
-chdef_dynamic_group
-chdef_multiple_keys
-chdef_n
+chdef_t_o_attr_noderange
 chdef_t_o_error
 chtab_null
 chtab_delete
@@ -20,12 +19,6 @@ chtab_err_symble
 chtab_err_table
 chtab_h
 chtab_v
-copycds_iso
-copycds_n
-copycds_a
-copycds_n_a
-copycds_a_err
-copycds_n_err
 packimage_o_p_a_m
 packimage_p_a_o
 packimage_imagename
@@ -33,11 +26,7 @@ packimage_h
 packimage_v
 pping_h
 pping_v
-pping_all
 pping_node
-getmacs_noderange
-getmacs_d
-getmacs_f_D
 gettab_key_table
 gettab_H
 gettab_err
@@ -57,8 +46,8 @@ makeconservercf_null
 makeconservercf_noderange
 makeconservercf_d
 makedhcp_n
-makedhcp_a
-makedhcp_a_d
+makedhcp_a_ubuntu
+makedhcp_a_ubuntu_d
 makedhcp_d
 mkdef_null
 mkdef_t_o_attr
@@ -129,25 +118,10 @@ nodeset_stat
 nodeset_noderange
 nodestat_noderange
 nodestat_err_node
-rinv_null
-rinv_bus
-rinv_config
-rinv_serial
-rinv_model
-rinv_firm
-rinv_all
-rinv_noderange_err
 rmdef_null
 rmdef_t_o_attr
 rmdef_f_all
 rmdef_t_err
-rpower_off
-rpower_stat
-rpower_boot
-rpower_on
-rpower_reset
-rpower_noderange
-rpower_noderange_nodeps
 rpower_err_noderange
 rscan_noderange
 rscan_x
@@ -157,10 +131,7 @@ rscan_x_w
 rscan_z_w
 mvitals_state
 rvitals_lcds
-rvitals_all
 rvitals_noderange_err
-sinv_c_p_t_r_o
-sinv_c_s_p_t_o
 tabdump_table
 tabdump_d
 tabdump_v
@@ -180,7 +151,6 @@ tabprune_h
 tabprune_v
 tabprune_a_eventlog
 tabprune_V_a_eventlog
-tabprune_p_auditlog
 tabprune_i_auditlog
 tabprune_V_n_auditlog
 tabgrep_node
@@ -219,36 +189,16 @@ lsxcatd_null
 lsxcatd_h
 lsxcatd_d
 lsxcatd_a
-makehosts_h
-makehosts_help
-makehosts_null
-makehosts_l
-makehosts_d
-makehosts_n
-makehosts_n_noderange
 xcatstart
 xcatstop
-xdcp_src_dst
 xdcp_P
-makedns_h
 makedns_n_node
 makedns_d_node
-makedns_n
-makedns
-noderange_individual_node
-noderange_individual_grp
-noderange_node01-node10
-noderange_node[01-10]
-noderange_node[01
-noderange_f[1-2]n[1-3]
-noderange_group1-group3
-noderange_node001-node200
-noderange_node10+3
-noderange_10-20
-noderange_XCAT_NODE_PREFIX
-noderange_XCAT_NODE_SUFFIX
-noderange_/nrtestnode.*
-noderange_/tmp/nodelistfile
-noderange_exclusion
-noderange_group_intersection
+makedns_ubuntu_n
+copycds_iso
+copycds_n
+copycds_a
+copycds_n_a
+copycds_a_err
+copycds_n_err