diff --git a/test/test_companion_offline_delivery.py b/test/test_companion_offline_delivery.py
index 5503b91f8..f102731da 100644
--- a/test/test_companion_offline_delivery.py
+++ b/test/test_companion_offline_delivery.py
@@ -49,7 +49,8 @@ struct MyMesh {
   uint8_t out_frame[MAX_FRAME_SIZE]{};
   int offline_queue_len=0, offline_queue_head=0;
 #if defined(OTA_SHARED_COMPANION_QUEUE)
-  mesh::BorrowableFrameBuffer<Frame,OFFLINE_QUEUE_SIZE,128,mesh::ota::OtaContext> offline_queue;
+@OTA_RETAINED@
+  mesh::BorrowableFrameBuffer<Frame,OFFLINE_QUEUE_SIZE,OTA_RETAINED_OFFLINE_FRAMES,mesh::ota::OtaContext> offline_queue;
 #elif ONE_KEY_DM_SHARED_OFFLINE_QUEUE
   Frame offline_queue[OFFLINE_QUEUE_SIZE]{};
   unsigned held_dm_count=15;
@@ -337,6 +338,10 @@ printf '%s\n' "$PLATFORMIO_BUILD_FLAGS" "$PLATFORMIO_BUILD_UNFLAGS"
             source, re.MULTILINE))
         native = (ROOT / "test/test_serial_mode_switch/test_serial_mode_switch.cpp").read_text()
         harness = HARNESS.replace("@METHODS@", methods).replace("@CONSTANTS@", constants)
+        retained = re.search(
+            r"static constexpr unsigned OTA_RETAINED_OFFLINE_FRAMES = \d+;", header)
+        self.assertIsNotNone(retained)
+        harness = harness.replace("@OTA_RETAINED@", retained[0])
         harness = harness.replace("@STREAM@", extract_braced(native, "class BufferStream") + ";")
         harness = harness.replace("@FRAME@", extract_braced(header, "struct Frame {") + ";")
         harness = harness.replace("@SYNC@", extract_braced(source, "if (cmd_frame[0] == CMD_SYNC_NEXT_MESSAGE)"))
diff --git a/test/test_firmware_ram.py b/test/test_firmware_ram.py
index 837e40a86..899f8efd3 100644
--- a/test/test_firmware_ram.py
+++ b/test/test_firmware_ram.py
@@ -1259,7 +1259,10 @@ int main() {
 
     def test_affected_esp32_full_overlay_keeps_documented_capacity_and_transports(self):
         for target in ("Heltec_v3_companion_radio_full", "Xiao_C3_companion_radio_full",
+                       "Heltec_ct62_companion_radio_full",
                        "heltec_tracker_v2_companion_radio_full_femon",
+                       "heltec_tracker_v2_companion_radio_full_femoff",
+                       "generic_espnow_companion_radio_full",
                        "Heltec_Wireless_Paper_companion_radio_full"):
             result = subprocess.run(["bash", "-c", '''
 source build.sh
@@ -1280,7 +1283,16 @@ printf '%s\\n' "$PLATFORMIO_BUILD_FLAGS"
                     self.assertNotIn("-DOFFLINE_QUEUE_SIZE=", result.stdout)
                 else:
                     self.assertIn("-DOFFLINE_QUEUE_SIZE=224", result.stdout)
-                self.assertNotIn("-DOTA_SHARED_COMPANION_QUEUE", result.stdout)
+                if target in ("Xiao_C3_companion_radio_full", "Heltec_ct62_companion_radio_full",
+                              "heltec_tracker_v2_companion_radio_full_femon",
+                              "heltec_tracker_v2_companion_radio_full_femoff"):
+                    self.assertIn("-DOTA_SHARED_COMPANION_QUEUE=1", result.stdout)
+                    self.assertIn("-DONE_KEY_DM_COMPACT_HELD=1", result.stdout)
+                else:
+                    self.assertNotIn("-DOTA_SHARED_COMPANION_QUEUE", result.stdout)
+            if target in ("Heltec_v3_companion_radio_full", "generic_espnow_companion_radio_full",
+                          "Heltec_Wireless_Paper_companion_radio_full"):
+                self.assertNotIn("-DONE_KEY_DM_COMPACT_HELD", result.stdout)
             self.assertIn("-DWIFI_OTA_SEEDER=1", result.stdout)
             self.assertIn("-DBLE_PIN_CODE=123456", result.stdout)