diff --git a/tests/components/mipi_spi/test.esp32-ard.yaml b/tests/components/mipi_spi/test.esp32-ard.yaml
index 90adabde8c..47e406ccad 100644
--- a/tests/components/mipi_spi/test.esp32-ard.yaml
+++ b/tests/components/mipi_spi/test.esp32-ard.yaml
@@ -1,15 +1,13 @@
 substitutions:
-  clk_pin: GPIO16
-  mosi_pin: GPIO17
-  miso_pin: GPIO15
   dc_pin: GPIO14
   cs_pin: GPIO13
   enable_pin: GPIO4
   reset_pin: GPIO20
 
+packages:
+  spi: !include ../../test_build_components/common/spi/esp32-ard.yaml
+  display: !include common.yaml
+
 display:
   - platform: mipi_spi
     model: LANBON-L8
-
-packages:
-  display: !include common.yaml
diff --git a/tests/components/mipi_spi/test.esp32-c3-ard.yaml b/tests/components/mipi_spi/test.esp32-c3-ard.yaml
index 0711bb6b6b..c940bc9d34 100644
--- a/tests/components/mipi_spi/test.esp32-c3-ard.yaml
+++ b/tests/components/mipi_spi/test.esp32-c3-ard.yaml
@@ -1,13 +1,13 @@
 substitutions:
-  clk_pin: GPIO6
-  mosi_pin: GPIO7
-  miso_pin: GPIO5
-  dc_pin: GPIO21
-  cs_pin: GPIO18
-  enable_pin: GPIO19
+  dc_pin: GPIO14
+  cs_pin: GPIO13
+  enable_pin: GPIO4
   reset_pin: GPIO20
 
 packages:
   spi: !include ../../test_build_components/common/spi/esp32-c3-ard.yaml
+  display: !include common.yaml
 
-<<: !include common.yaml
+display:
+  - platform: mipi_spi
+    model: LANBON-L8
diff --git a/tests/components/mipi_spi/test.esp32-c3-idf.yaml b/tests/components/mipi_spi/test.esp32-c3-idf.yaml
index c4d667e779..49ff33b50f 100644
--- a/tests/components/mipi_spi/test.esp32-c3-idf.yaml
+++ b/tests/components/mipi_spi/test.esp32-c3-idf.yaml
@@ -1,9 +1,13 @@
 substitutions:
-  dc_pin: GPIO21
-  cs_pin: GPIO18
-  enable_pin: GPIO19
+  dc_pin: GPIO14
+  cs_pin: GPIO13
+  enable_pin: GPIO4
   reset_pin: GPIO20
+
 packages:
   spi: !include ../../test_build_components/common/spi/esp32-c3-idf.yaml
+  display: !include common.yaml
 
-<<: !include common.yaml
+display:
+  - platform: mipi_spi
+    model: LANBON-L8
diff --git a/tests/components/mipi_spi/test.esp32-idf.yaml b/tests/components/mipi_spi/test.esp32-idf.yaml
index 20516049c3..e2f2d0d4cd 100644
--- a/tests/components/mipi_spi/test.esp32-idf.yaml
+++ b/tests/components/mipi_spi/test.esp32-idf.yaml
@@ -1,14 +1,13 @@
 substitutions:
-  dc_pin: GPIO21
-  cs_pin: GPIO12
-  enable_pin: GPIO13
+  dc_pin: GPIO14
+  cs_pin: GPIO13
+  enable_pin: GPIO4
   reset_pin: GPIO20
 
 packages:
   spi: !include ../../test_build_components/common/spi/esp32-idf.yaml
-
-<<: !include common.yaml
+  display: !include common.yaml
 
 display:
   - platform: mipi_spi
-    model: m5core
+    model: LANBON-L8
diff --git a/tests/components/mipi_spi/test.rp2040-ard.yaml b/tests/components/mipi_spi/test.rp2040-ard.yaml
index cacd62ade3..9dc2c33521 100644
--- a/tests/components/mipi_spi/test.rp2040-ard.yaml
+++ b/tests/components/mipi_spi/test.rp2040-ard.yaml
@@ -1,13 +1,13 @@
 substitutions:
-  clk_pin: GPIO2
-  mosi_pin: GPIO3
-  miso_pin: GPIO4
   dc_pin: GPIO14
   cs_pin: GPIO13
-  enable_pin: GPIO19
+  enable_pin: GPIO4
   reset_pin: GPIO20
 
 packages:
   spi: !include ../../test_build_components/common/spi/rp2040-ard.yaml
+  display: !include common.yaml
 
-<<: !include common.yaml
+display:
+  - platform: mipi_spi
+    model: LANBON-L8
diff --git a/tests/components/mlx90393/test.esp32-s3-ard.yaml b/tests/components/mlx90393/test.esp32-s3-ard.yaml
index ee2c29ca4e..eaa85f3815 100644
--- a/tests/components/mlx90393/test.esp32-s3-ard.yaml
+++ b/tests/components/mlx90393/test.esp32-s3-ard.yaml
@@ -1,5 +1,4 @@
-substitutions:
-  scl_pin: GPIO5
-  sda_pin: GPIO4
+packages:
+  i2c: !include ../../test_build_components/common/i2c/esp32-s3-ard.yaml
 
 <<: !include common.yaml
diff --git a/tests/components/mlx90393/test.esp32-s3-idf.yaml b/tests/components/mlx90393/test.esp32-s3-idf.yaml
index ee2c29ca4e..0fd8684a2c 100644
--- a/tests/components/mlx90393/test.esp32-s3-idf.yaml
+++ b/tests/components/mlx90393/test.esp32-s3-idf.yaml
@@ -1,5 +1,4 @@
-substitutions:
-  scl_pin: GPIO5
-  sda_pin: GPIO4
+packages:
+  i2c: !include ../../test_build_components/common/i2c/esp32-s3-idf.yaml
 
 <<: !include common.yaml
diff --git a/tests/components/npi19/test.esp32-s3-ard.yaml b/tests/components/npi19/test.esp32-s3-ard.yaml
index 4942e3c2b3..eaa85f3815 100644
--- a/tests/components/npi19/test.esp32-s3-ard.yaml
+++ b/tests/components/npi19/test.esp32-s3-ard.yaml
@@ -1,5 +1,4 @@
-substitutions:
-  scl_pin: GPIO40
-  sda_pin: GPIO41
+packages:
+  i2c: !include ../../test_build_components/common/i2c/esp32-s3-ard.yaml
 
 <<: !include common.yaml
diff --git a/tests/components/npi19/test.esp32-s3-idf.yaml b/tests/components/npi19/test.esp32-s3-idf.yaml
index 4942e3c2b3..0fd8684a2c 100644
--- a/tests/components/npi19/test.esp32-s3-idf.yaml
+++ b/tests/components/npi19/test.esp32-s3-idf.yaml
@@ -1,5 +1,4 @@
-substitutions:
-  scl_pin: GPIO40
-  sda_pin: GPIO41
+packages:
+  i2c: !include ../../test_build_components/common/i2c/esp32-s3-idf.yaml
 
 <<: !include common.yaml