diff --git a/xCAT-test/autotest/bundle/hdctrl_bmc.bundle b/xCAT-test/autotest/bundle/hdctrl_bmc.bundle
new file mode 100644
index 000000000..08ddf66c1
--- /dev/null
+++ b/xCAT-test/autotest/bundle/hdctrl_bmc.bundle
@@ -0,0 +1,5 @@
+#INCLUDE:hdctrl_general.bundle#
+rvitals_wattage
+rvitals_fanspeed
+rvitals_power
+rvitals_leds
diff --git a/xCAT-test/autotest/bundle/hdctrl_general.bundle b/xCAT-test/autotest/bundle/hdctrl_general.bundle
new file mode 100644
index 000000000..7ea993052
--- /dev/null
+++ b/xCAT-test/autotest/bundle/hdctrl_general.bundle
@@ -0,0 +1,25 @@
+rpower_off
+rpower_stat
+rpower_status
+rpower_state
+rpower_boot
+rpower_on
+rpower_reset
+rpower_noderange
+rpower_noderange_nodeps
+rpower_err_noderange
+rinv_h
+rinv_v
+rinv_help
+rinv_errorcommand
+rinv_serial
+rinv_model
+rinv_firm
+rinv_all
+rvitals_h
+rvitals_v
+rvitals_errorcommand
+rvitals_temp
+rvitals_voltage
+rvitals_all
+rvitals_noderange_err
diff --git a/xCAT-test/autotest/bundle/hdctrl_openpower_ipmi.bundle b/xCAT-test/autotest/bundle/hdctrl_openpower_ipmi.bundle
new file mode 100644
index 000000000..7ab405aab
--- /dev/null
+++ b/xCAT-test/autotest/bundle/hdctrl_openpower_ipmi.bundle
@@ -0,0 +1,10 @@
+#INCLUDE:hdctrl_general.bundle#
+rinv_deviceid
+rinv_uuid
+rinv_guid
+rinv_vpd
+rinv_mprom
+rvitals_wattage
+rvitals_fanspeed
+rvitals_power
+rvitals_leds
diff --git a/xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle b/xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle
new file mode 100644
index 000000000..043bb245e
--- /dev/null
+++ b/xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle
@@ -0,0 +1,10 @@
+#INCLUDE:hdctrl_general.bundle#
+rinv_deviceid
+rinv_uuid
+rinv_vpd
+rinv_cpu
+rinv_dimm
+rvitals_wattage
+rvitals_fanspeed
+rvitals_power
+rvitals_leds
diff --git a/xCAT-test/autotest/bundle/hdctrl_ppc_hmc.bundle b/xCAT-test/autotest/bundle/hdctrl_ppc_hmc.bundle
new file mode 100644
index 000000000..e7ba1aa74
--- /dev/null
+++ b/xCAT-test/autotest/bundle/hdctrl_ppc_hmc.bundle
@@ -0,0 +1,4 @@
+#INCLUDE:hdctrl_general.bundle#
+rinv_bus
+rinv_config
+rvitals_lcds