diff --git a/components/driver/test_apps/legacy_twai/pytest_twai.py b/components/driver/test_apps/legacy_twai/pytest_twai.py
index 8e73a13167..5d6bd65bfc 100644
--- a/components/driver/test_apps/legacy_twai/pytest_twai.py
+++ b/components/driver/test_apps/legacy_twai/pytest_twai.py
@@ -26,7 +26,7 @@ def test_twai_self(dut: Dut) -> None:
     dut.run_all_single_board_cases(group='twai-loop-back')
 
 
-@pytest.fixture(name='socket_can', scope='module')
+@pytest.fixture(name='socket_can')
 def fixture_create_socket_can() -> Bus:
     # Set up the socket CAN with the bitrate
     start_command = 'sudo ip link set can0 up type can bitrate 250000 restart-ms 100'
diff --git a/components/esp_driver_twai/test_apps/test_twai/pytest_driver_twai.py b/components/esp_driver_twai/test_apps/test_twai/pytest_driver_twai.py
index e5fe115cf2..12a28fe91f 100644
--- a/components/esp_driver_twai/test_apps/test_twai/pytest_driver_twai.py
+++ b/components/esp_driver_twai/test_apps/test_twai/pytest_driver_twai.py
@@ -38,7 +38,6 @@ def fixture_create_socket_can() -> Bus:
 @pytest.mark.twai_std
 @pytest.mark.temp_skip_ci(targets=['esp32c5'], reason='no runner')
 @pytest.mark.parametrize('config', ['release'], indirect=True)
-@pytest.mark.timeout(10)  # Whole test timeout
 @idf_parametrize('target', soc_filtered_targets('SOC_TWAI_SUPPORTED == 1'), indirect=['target'])
 def test_driver_twai_listen_only(dut: Dut, socket_can: Bus) -> None:
     dut.serial.hard_reset()
@@ -62,7 +61,6 @@ def test_driver_twai_listen_only(dut: Dut, socket_can: Bus) -> None:
 @pytest.mark.twai_std
 @pytest.mark.temp_skip_ci(targets=['esp32c5'], reason='no runner')
 @pytest.mark.parametrize('config', ['release'], indirect=True)
-@pytest.mark.timeout(10)  # Whole test timeout
 @idf_parametrize('target', soc_filtered_targets('SOC_TWAI_SUPPORTED == 1'), indirect=['target'])
 def test_driver_twai_remote_request(dut: Dut, socket_can: Bus) -> None:
     dut.serial.hard_reset()