diff --git a/tests/components/ota/common.yaml b/tests/components/ota/common.yaml
index 1433dada1f..af8cf66708 100644
--- a/tests/components/ota/common.yaml
+++ b/tests/components/ota/common.yaml
@@ -1,11 +1,6 @@
-wifi:
-  ssid: MySSID
-  password: password1
-
 ota:
   - platform: esphome
     password: "superlongpasswordthatnoonewillknow"
-    port: 3286
     on_begin:
       then:
         - logger.log: "OTA start"
diff --git a/tests/components/ota/test-api_key_offer.esp8266-ard.yaml b/tests/components/ota/test-api_key_offer.esp8266-ard.yaml
deleted file mode 100644
index ecda625521..0000000000
--- a/tests/components/ota/test-api_key_offer.esp8266-ard.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-packages:
-  ota: !include api_key_offer.yaml
diff --git a/tests/components/ota/test-api_runtime_key.esp8266-ard.yaml b/tests/components/ota/test-api_runtime_key.esp8266-ard.yaml
deleted file mode 100644
index 4709a9e45c..0000000000
--- a/tests/components/ota/test-api_runtime_key.esp8266-ard.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-packages:
-  ota: !include api_runtime_key.yaml
diff --git a/tests/components/ota/test-partition_access.esp32-idf.yaml b/tests/components/ota/test-partition_access.esp32-idf.yaml
deleted file mode 100644
index 0cbf854952..0000000000
--- a/tests/components/ota/test-partition_access.esp32-idf.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-ota:
-  - platform: esphome
-    allow_partition_access: true
-
-<<: !include common.yaml
diff --git a/tests/components/ota/test.bk72xx-ard.yaml b/tests/components/ota/test.bk72xx-ard.yaml
index dade44d145..3b32457cf4 100644
--- a/tests/components/ota/test.bk72xx-ard.yaml
+++ b/tests/components/ota/test.bk72xx-ard.yaml
@@ -1 +1,3 @@
-<<: !include common.yaml
+packages:
+  wifi: !include wifi.yaml
+  ota: !include common.yaml
diff --git a/tests/components/ota/test.esp32-ard.yaml b/tests/components/ota/test.esp32-ard.yaml
index dade44d145..3b32457cf4 100644
--- a/tests/components/ota/test.esp32-ard.yaml
+++ b/tests/components/ota/test.esp32-ard.yaml
@@ -1 +1,3 @@
-<<: !include common.yaml
+packages:
+  wifi: !include wifi.yaml
+  ota: !include common.yaml
diff --git a/tests/components/ota/test.esp32-idf.yaml b/tests/components/ota/test.esp32-idf.yaml
index dade44d145..7f25fafadb 100644
--- a/tests/components/ota/test.esp32-idf.yaml
+++ b/tests/components/ota/test.esp32-idf.yaml
@@ -1 +1,8 @@
-<<: !include common.yaml
+packages:
+  wifi: !include wifi.yaml
+  ota: !include common.yaml
+
+# Final validation merges this into the common block
+ota:
+  - platform: esphome
+    allow_partition_access: true
diff --git a/tests/components/ota/test.esp8266-ard.yaml b/tests/components/ota/test.esp8266-ard.yaml
index dade44d145..3b32457cf4 100644
--- a/tests/components/ota/test.esp8266-ard.yaml
+++ b/tests/components/ota/test.esp8266-ard.yaml
@@ -1 +1,3 @@
-<<: !include common.yaml
+packages:
+  wifi: !include wifi.yaml
+  ota: !include common.yaml
diff --git a/tests/components/ota/test.host.yaml b/tests/components/ota/test.host.yaml
index ae7c4d0add..fdfbf47139 100644
--- a/tests/components/ota/test.host.yaml
+++ b/tests/components/ota/test.host.yaml
@@ -1,4 +1,2 @@
-<<: !include common.yaml
-
-#host platform does not support wifi / network is automatically included
-wifi: !remove
+packages:
+  ota: !include common.yaml
diff --git a/tests/components/ota/test.rp2040-ard.yaml b/tests/components/ota/test.rp2040-ard.yaml
index dade44d145..3b32457cf4 100644
--- a/tests/components/ota/test.rp2040-ard.yaml
+++ b/tests/components/ota/test.rp2040-ard.yaml
@@ -1 +1,3 @@
-<<: !include common.yaml
+packages:
+  wifi: !include wifi.yaml
+  ota: !include common.yaml
diff --git a/tests/components/ota/test-empty_password.esp8266-ard.yaml b/tests/components/ota/validate-empty_password.esp8266-ard.yaml
similarity index 100%
rename from tests/components/ota/test-empty_password.esp8266-ard.yaml
rename to tests/components/ota/validate-empty_password.esp8266-ard.yaml
diff --git a/tests/components/ota/test-encryption_inherit.esp8266-ard.yaml b/tests/components/ota/validate-encryption_inherit.esp8266-ard.yaml
similarity index 100%
rename from tests/components/ota/test-encryption_inherit.esp8266-ard.yaml
rename to tests/components/ota/validate-encryption_inherit.esp8266-ard.yaml
diff --git a/tests/components/ota/wifi.yaml b/tests/components/ota/wifi.yaml
new file mode 100644
index 0000000000..ac662302fc
--- /dev/null
+++ b/tests/components/ota/wifi.yaml
@@ -0,0 +1,3 @@
+wifi:
+  ssid: MySSID
+  password: password1