diff --git a/tests/components/cwww/common.yaml b/tests/components/cwww/common.yaml
index 0ad5beeaae..7fa5ab668c 100644
--- a/tests/components/cwww/common.yaml
+++ b/tests/components/cwww/common.yaml
@@ -1,11 +1,3 @@
-output:
-  - platform: ${light_platform}
-    id: light_output_1
-    pin: ${pin_o1}
-  - platform: ${light_platform}
-    id: light_output_2
-    pin: ${pin_o2}
-
 light:
   - platform: cwww
     name: CWWW Light
diff --git a/tests/components/cwww/test.esp32-c3-idf.yaml b/tests/components/cwww/test.esp32-c3-idf.yaml
index 982394ded6..51571b34cf 100644
--- a/tests/components/cwww/test.esp32-c3-idf.yaml
+++ b/tests/components/cwww/test.esp32-c3-idf.yaml
@@ -3,12 +3,15 @@ substitutions:
   pin_o1: GPIO6
   pin_o2: GPIO7
 
-packages:
-  device_base: !include common.yaml
-
 output:
-  - id: !extend light_output_1
+  - platform: ${light_platform}
+    id: light_output_1
+    pin: ${pin_o1}
     channel: 0
-  - id: !extend light_output_2
+  - platform: ${light_platform}
+    id: light_output_2
+    pin: ${pin_o2}
     channel: 1
     phase_angle: 180°
+
+<<: !include common.yaml
diff --git a/tests/components/cwww/test.esp32-idf.yaml b/tests/components/cwww/test.esp32-idf.yaml
index d2a998e6b3..01edf0b0b5 100644
--- a/tests/components/cwww/test.esp32-idf.yaml
+++ b/tests/components/cwww/test.esp32-idf.yaml
@@ -3,12 +3,15 @@ substitutions:
   pin_o1: GPIO16
   pin_o2: GPIO17
 
-packages:
-  device_base: !include common.yaml
-
 output:
-  - id: !extend light_output_1
+  - platform: ${light_platform}
+    id: light_output_1
+    pin: ${pin_o1}
     channel: 0
-  - id: !extend light_output_2
+  - platform: ${light_platform}
+    id: light_output_2
+    pin: ${pin_o2}
     channel: 1
     phase_angle: 180°
+
+<<: !include common.yaml
diff --git a/tests/components/cwww/test.esp8266-ard.yaml b/tests/components/cwww/test.esp8266-ard.yaml
index 75a5b9d64d..49d73b7d3d 100644
--- a/tests/components/cwww/test.esp8266-ard.yaml
+++ b/tests/components/cwww/test.esp8266-ard.yaml
@@ -3,4 +3,12 @@ substitutions:
   pin_o1: GPIO12
   pin_o2: GPIO13
 
+output:
+  - platform: ${light_platform}
+    id: light_output_1
+    pin: ${pin_o1}
+  - platform: ${light_platform}
+    id: light_output_2
+    pin: ${pin_o2}
+
 <<: !include common.yaml
diff --git a/tests/components/cwww/test.rp2040-ard.yaml b/tests/components/cwww/test.rp2040-ard.yaml
index 537177aca1..ba8e0ad071 100644
--- a/tests/components/cwww/test.rp2040-ard.yaml
+++ b/tests/components/cwww/test.rp2040-ard.yaml
@@ -3,4 +3,12 @@ substitutions:
   pin_o1: GPIO12
   pin_o2: GPIO13
 
+output:
+  - platform: ${light_platform}
+    id: light_output_1
+    pin: ${pin_o1}
+  - platform: ${light_platform}
+    id: light_output_2
+    pin: ${pin_o2}
+
 <<: !include common.yaml
diff --git a/tests/components/hbridge/common.yaml b/tests/components/hbridge/common.yaml
index 0504cdea03..ca619d6851 100644
--- a/tests/components/hbridge/common.yaml
+++ b/tests/components/hbridge/common.yaml
@@ -31,9 +31,3 @@ fan:
     on_preset_set:
       then:
         - logger.log: Preset mode was changed!
-
-switch:
-  - platform: hbridge
-    id: switch_hbridge
-    on_pin: ${hbridge_on_pin}
-    off_pin: ${hbridge_off_pin}
diff --git a/tests/components/hbridge/test.esp32-c3-idf.yaml b/tests/components/hbridge/test.esp32-c3-idf.yaml
index c73f08b6de..93a6cb5818 100644
--- a/tests/components/hbridge/test.esp32-c3-idf.yaml
+++ b/tests/components/hbridge/test.esp32-c3-idf.yaml
@@ -7,9 +7,11 @@ substitutions:
   hbridge_on_pin: "2"
   hbridge_off_pin: "3"
 
-packages:
-  common: !include common.yaml
+<<: !include common.yaml
 
 switch:
-  - id: !extend switch_hbridge
+  - platform: hbridge
+    id: switch_hbridge
+    on_pin: ${hbridge_on_pin}
+    off_pin: ${hbridge_off_pin}
     pulse_length: 60ms
diff --git a/tests/components/hbridge/test.esp32-idf.yaml b/tests/components/hbridge/test.esp32-idf.yaml
index dbbfa738c7..7f3d9b928a 100644
--- a/tests/components/hbridge/test.esp32-idf.yaml
+++ b/tests/components/hbridge/test.esp32-idf.yaml
@@ -7,10 +7,12 @@ substitutions:
   hbridge_on_pin: "4"
   hbridge_off_pin: "5"
 
-packages:
-  common: !include common.yaml
+<<: !include common.yaml
 
 switch:
-  - id: !extend switch_hbridge
+  - platform: hbridge
+    id: switch_hbridge
+    on_pin: ${hbridge_on_pin}
+    off_pin: ${hbridge_off_pin}
     pulse_length: 60ms
     wait_time: 10ms
diff --git a/tests/components/hbridge/test.esp8266-ard.yaml b/tests/components/hbridge/test.esp8266-ard.yaml
index f560da5d38..0346c8801d 100644
--- a/tests/components/hbridge/test.esp8266-ard.yaml
+++ b/tests/components/hbridge/test.esp8266-ard.yaml
@@ -7,10 +7,12 @@ substitutions:
   hbridge_on_pin: "14"
   hbridge_off_pin: "15"
 
-packages:
-  common: !include common.yaml
+<<: !include common.yaml
 
 switch:
-  - id: !extend switch_hbridge
+  - platform: hbridge
+    id: switch_hbridge
+    on_pin: ${hbridge_on_pin}
+    off_pin: ${hbridge_off_pin}
     pulse_length: 60ms
     wait_time: 10ms
diff --git a/tests/components/hbridge/test.rp2040-ard.yaml b/tests/components/hbridge/test.rp2040-ard.yaml
index aa6e290cab..f9cb2b5618 100644
--- a/tests/components/hbridge/test.rp2040-ard.yaml
+++ b/tests/components/hbridge/test.rp2040-ard.yaml
@@ -7,10 +7,12 @@ substitutions:
   hbridge_on_pin: "2"
   hbridge_off_pin: "3"
 
-packages:
-  common: !include common.yaml
+<<: !include common.yaml
 
 switch:
-  - id: !extend switch_hbridge
+  - platform: hbridge
+    id: switch_hbridge
+    on_pin: ${hbridge_on_pin}
+    off_pin: ${hbridge_off_pin}
     wait_time: 10ms
     optimistic: true