diff --git a/esphome/components/wireguard/binary_sensor.py b/esphome/components/wireguard/binary_sensor.py
index 2ba59d4c39..a1fd366ccf 100644
--- a/esphome/components/wireguard/binary_sensor.py
+++ b/esphome/components/wireguard/binary_sensor.py
@@ -24,12 +24,8 @@ CONFIG_SCHEMA = {
 
 
 async def to_code(config):
-    parent = await cg.get_variable(config[CONF_WIREGUARD_ID])
+    hub = await cg.get_variable(config[CONF_WIREGUARD_ID])
 
-    if status_config := config.get(CONF_STATUS):
-        sens = await binary_sensor.new_binary_sensor(status_config)
-        cg.add(parent.set_status_sensor(sens))
-
-    if enabled_config := config.get(CONF_ENABLED):
-        sens = await binary_sensor.new_binary_sensor(enabled_config)
-        cg.add(parent.set_enabled_sensor(sens))
+    binary_sensors = binary_sensor.sub_binary_sensors(config)
+    await binary_sensors(CONF_STATUS, hub.set_status_sensor)
+    await binary_sensors(CONF_ENABLED, hub.set_enabled_sensor)
diff --git a/esphome/components/wireguard/sensor.py b/esphome/components/wireguard/sensor.py
index 4c9d601eee..49146025af 100644
--- a/esphome/components/wireguard/sensor.py
+++ b/esphome/components/wireguard/sensor.py
@@ -19,8 +19,7 @@ CONFIG_SCHEMA = {
 
 
 async def to_code(config):
-    parent = await cg.get_variable(config[CONF_WIREGUARD_ID])
+    hub = await cg.get_variable(config[CONF_WIREGUARD_ID])
 
-    if latest_handshake_config := config.get(CONF_LATEST_HANDSHAKE):
-        sens = await sensor.new_sensor(latest_handshake_config)
-        cg.add(parent.set_handshake_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_LATEST_HANDSHAKE, hub.set_handshake_sensor)
diff --git a/esphome/components/wireguard/text_sensor.py b/esphome/components/wireguard/text_sensor.py
index e48678f5bf..7beb4b08f0 100644
--- a/esphome/components/wireguard/text_sensor.py
+++ b/esphome/components/wireguard/text_sensor.py
@@ -16,8 +16,7 @@ CONFIG_SCHEMA = {
 
 
 async def to_code(config):
-    parent = await cg.get_variable(config[CONF_WIREGUARD_ID])
+    hub = await cg.get_variable(config[CONF_WIREGUARD_ID])
 
-    if address_config := config.get(CONF_ADDRESS):
-        sens = await text_sensor.new_text_sensor(address_config)
-        cg.add(parent.set_address_sensor(sens))
+    text_sensors = text_sensor.sub_text_sensors(config)
+    await text_sensors(CONF_ADDRESS, hub.set_address_sensor)