diff --git a/pytest-embedded-nuttx/pytest_embedded_nuttx/serial.py b/pytest-embedded-nuttx/pytest_embedded_nuttx/serial.py
index 6fc30733..494d3098 100644
--- a/pytest-embedded-nuttx/pytest_embedded_nuttx/serial.py
+++ b/pytest-embedded-nuttx/pytest_embedded_nuttx/serial.py
@@ -16,7 +16,6 @@ class NuttxSerial(EspSerial):
     # Default offset for the primary MCUBoot slot across
     # all Espressif devices on NuttX
     MCUBOOT_PRIMARY_SLOT_OFFSET = 0x10000
-    FLASH_BAUDRATE = 921600
     SERIAL_BAUDRATE = 115200
 
     binary_offsets: ClassVar[Dict[str, int]] = {
@@ -103,7 +102,7 @@ def flash(self) -> None:
                 '--port',
                 self.port,
                 '--baud',
-                str(self.FLASH_BAUDRATE),
+                str(self.esptool_baud),
                 'write_flash',
                 *flash_files,
                 *flash_settings,
diff --git a/pytest-embedded/pytest_embedded/dut_factory.py b/pytest-embedded/pytest_embedded/dut_factory.py
index 4bde1abd..239eee75 100644
--- a/pytest-embedded/pytest_embedded/dut_factory.py
+++ b/pytest-embedded/pytest_embedded/dut_factory.py
@@ -243,7 +243,6 @@ def _fixture_classes_and_options_fn(
                     kwargs[fixture].update({
                         'app': None,
                         'baud': int(baud or NuttxSerial.SERIAL_BAUDRATE),
-                        'esptool_baud': int(os.getenv('ESPBAUD') or esptool_baud or NuttxSerial.FLASH_BAUDRATE),
                     })
                 else:
                     from pytest_embedded_serial_esp import EspSerial