diff --git a/pytest-embedded-arduino/pytest_embedded_arduino/app.py b/pytest-embedded-arduino/pytest_embedded_arduino/app.py
index 3a275365..e5d5d403 100644
--- a/pytest-embedded-arduino/pytest_embedded_arduino/app.py
+++ b/pytest-embedded-arduino/pytest_embedded_arduino/app.py
@@ -19,23 +19,25 @@ class ArduinoApp(App):
     #: dict of flash settings
     flash_settings: ClassVar[dict[str, dict[str, str]]] = {
         'esp32': {'flash_mode': 'dio', 'flash_size': 'detect', 'flash_freq': '80m'},
-        'esp32s2': {'flash_mode': 'dio', 'flash_size': 'detect', 'flash_freq': '80m'},
         'esp32c3': {'flash_mode': 'dio', 'flash_size': 'detect', 'flash_freq': '80m'},
-        'esp32s3': {'flash_mode': 'dio', 'flash_size': 'detect', 'flash_freq': '80m'},
+        'esp32c5': {'flash_mode': 'dio', 'flash_size': 'detect', 'flash_freq': '80m'},
         'esp32c6': {'flash_mode': 'dio', 'flash_size': 'detect', 'flash_freq': '80m'},
         'esp32h2': {'flash_mode': 'dio', 'flash_size': 'detect', 'flash_freq': '48m'},
         'esp32p4': {'flash_mode': 'dio', 'flash_size': 'detect', 'flash_freq': '80m'},
+        'esp32s2': {'flash_mode': 'dio', 'flash_size': 'detect', 'flash_freq': '80m'},
+        'esp32s3': {'flash_mode': 'dio', 'flash_size': 'detect', 'flash_freq': '80m'},
     }
 
     #: dict of binaries' offset.
     binary_offsets: ClassVar[dict[str, list[int]]] = {
         'esp32': [0x1000, 0x8000, 0x10000],
-        'esp32s2': [0x1000, 0x8000, 0x10000],
         'esp32c3': [0x0, 0x8000, 0x10000],
-        'esp32s3': [0x0, 0x8000, 0x10000],
+        'esp32c5': [0x0, 0x8000, 0x10000],
         'esp32c6': [0x0, 0x8000, 0x10000],
         'esp32h2': [0x0, 0x8000, 0x10000],
         'esp32p4': [0x2000, 0x8000, 0x10000],
+        'esp32s2': [0x1000, 0x8000, 0x10000],
+        'esp32s3': [0x0, 0x8000, 0x10000],
     }
 
     def __init__(
diff --git a/pytest-embedded-nuttx/pytest_embedded_nuttx/serial.py b/pytest-embedded-nuttx/pytest_embedded_nuttx/serial.py
index f3942fbf..f204d824 100644
--- a/pytest-embedded-nuttx/pytest_embedded_nuttx/serial.py
+++ b/pytest-embedded-nuttx/pytest_embedded_nuttx/serial.py
@@ -21,12 +21,13 @@ class NuttxSerial(EspSerial):
 
     binary_offsets: ClassVar[dict[str, int]] = {
         'esp32': 0x1000,
-        'esp32s2': 0x1000,
         'esp32c3': 0x0,
-        'esp32s3': 0x0,
+        'esp32c5': 0x0,
         'esp32c6': 0x0,
         'esp32h2': 0x0,
         'esp32p4': 0x2000,
+        'esp32s2': 0x1000,
+        'esp32s3': 0x0,
     }
 
     def __init__(