diff --git a/components/esp_eth/test_apps/sdkconfig.ci.single_core_ip101 b/components/esp_eth/test_apps/sdkconfig.ci.single_core_ip101
index 8cb1c3d758..98601e1b09 100644
--- a/components/esp_eth/test_apps/sdkconfig.ci.single_core_ip101
+++ b/components/esp_eth/test_apps/sdkconfig.ci.single_core_ip101
@@ -1,5 +1,4 @@
 CONFIG_IDF_TARGET="esp32"
-CONFIG_MEMMAP_SMP=n
 CONFIG_FREERTOS_UNICORE=y
 CONFIG_ESP32_IRAM_AS_8BIT_ACCESSIBLE_MEMORY=y
 CONFIG_ESP32_RTCDATA_IN_FAST_MEM=y
diff --git a/components/esp_mm/test_apps/mm/pytest_mmap.py b/components/esp_mm/test_apps/mm/pytest_mmap.py
index 7d725d080e..5282a7f581 100644
--- a/components/esp_mm/test_apps/mm/pytest_mmap.py
+++ b/components/esp_mm/test_apps/mm/pytest_mmap.py
@@ -20,32 +20,28 @@ def test_mmap(dut: Dut) -> None:
 
 
 # mmu tests with psram enabled
-@pytest.mark.esp32
-@pytest.mark.esp32s2
-@pytest.mark.esp32s3
+PSRAM_RELEASE_CONFIGS = [
+    pytest.param('psram_release_esp32', marks=[pytest.mark.esp32]),
+    pytest.param('psram_release_esp32s2', marks=[pytest.mark.esp32s2]),
+    pytest.param('psram_release_esp32s3', marks=[pytest.mark.esp32s3]),
+]
+
+
 @pytest.mark.generic
-@pytest.mark.parametrize(
-    'config',
-    [
-        'psram_release',
-    ],
-    indirect=True,
-)
+@pytest.mark.parametrize('config', PSRAM_RELEASE_CONFIGS, indirect=True)
 def test_mmap_psram(dut: Dut) -> None:
     dut.run_all_single_board_cases(group='mmu')
 
 
 # mmu tests with xip_psram
-@pytest.mark.esp32s2
-@pytest.mark.esp32s3
+XIP_CONFIGS = [
+    pytest.param('xip_psram_esp32s2', marks=[pytest.mark.esp32s2]),
+    pytest.param('xip_psram_esp32s3', marks=[pytest.mark.esp32s3]),
+]
+
+
 @pytest.mark.generic
-@pytest.mark.parametrize(
-    'config',
-    [
-        'xip_psram'
-    ],
-    indirect=True,
-)
+@pytest.mark.parametrize('config', XIP_CONFIGS, indirect=True)
 def test_mmap_xip_psram(dut: Dut) -> None:
     dut.run_all_single_board_cases(group='mmu')
 
@@ -65,31 +61,14 @@ def test_cache(dut: Dut) -> None:
 
 
 # cache tests with psram enabled
-@pytest.mark.esp32
-@pytest.mark.esp32s2
-@pytest.mark.esp32s3
 @pytest.mark.generic
-@pytest.mark.parametrize(
-    'config',
-    [
-        'psram_release',
-    ],
-    indirect=True,
-)
+@pytest.mark.parametrize('config', PSRAM_RELEASE_CONFIGS, indirect=True)
 def test_cache_psram(dut: Dut) -> None:
     dut.run_all_single_board_cases(group='cache')
 
 
 # cache tests with xip_psram
-@pytest.mark.esp32s2
-@pytest.mark.esp32s3
 @pytest.mark.generic
-@pytest.mark.parametrize(
-    'config',
-    [
-        'xip_psram'
-    ],
-    indirect=True,
-)
+@pytest.mark.parametrize('config', XIP_CONFIGS, indirect=True)
 def test_cache_xip_psram(dut: Dut) -> None:
     dut.run_all_single_board_cases(group='cache')
diff --git a/components/esp_mm/test_apps/mm/sdkconfig.ci.psram_release b/components/esp_mm/test_apps/mm/sdkconfig.ci.psram_release_esp32
similarity index 85%
rename from components/esp_mm/test_apps/mm/sdkconfig.ci.psram_release
rename to components/esp_mm/test_apps/mm/sdkconfig.ci.psram_release_esp32
index 36ed5eb72e..ff9b0e4e86 100644
--- a/components/esp_mm/test_apps/mm/sdkconfig.ci.psram_release
+++ b/components/esp_mm/test_apps/mm/sdkconfig.ci.psram_release_esp32
@@ -1,3 +1,4 @@
+CONFIG_IDF_TARGET="esp32"
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y
diff --git a/components/esp_mm/test_apps/mm/sdkconfig.ci.psram_release_esp32s2 b/components/esp_mm/test_apps/mm/sdkconfig.ci.psram_release_esp32s2
new file mode 100644
index 0000000000..7926e8abe1
--- /dev/null
+++ b/components/esp_mm/test_apps/mm/sdkconfig.ci.psram_release_esp32s2
@@ -0,0 +1,6 @@
+CONFIG_IDF_TARGET="esp32s2"
+CONFIG_COMPILER_OPTIMIZATION_SIZE=y
+CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
+CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y
+
+CONFIG_SPIRAM=y
diff --git a/components/esp_mm/test_apps/mm/sdkconfig.ci.psram_release_esp32s3 b/components/esp_mm/test_apps/mm/sdkconfig.ci.psram_release_esp32s3
new file mode 100644
index 0000000000..671195d027
--- /dev/null
+++ b/components/esp_mm/test_apps/mm/sdkconfig.ci.psram_release_esp32s3
@@ -0,0 +1,6 @@
+CONFIG_IDF_TARGET="esp32s3"
+CONFIG_COMPILER_OPTIMIZATION_SIZE=y
+CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
+CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y
+
+CONFIG_SPIRAM=y
diff --git a/components/esp_mm/test_apps/mm/sdkconfig.ci.xip_psram b/components/esp_mm/test_apps/mm/sdkconfig.ci.xip_psram_esp32s2
similarity index 88%
rename from components/esp_mm/test_apps/mm/sdkconfig.ci.xip_psram
rename to components/esp_mm/test_apps/mm/sdkconfig.ci.xip_psram_esp32s2
index db8dcd96c2..12d2d01850 100644
--- a/components/esp_mm/test_apps/mm/sdkconfig.ci.xip_psram
+++ b/components/esp_mm/test_apps/mm/sdkconfig.ci.xip_psram_esp32s2
@@ -1,3 +1,4 @@
+CONFIG_IDF_TARGET="esp32s2"
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y
diff --git a/components/esp_mm/test_apps/mm/sdkconfig.ci.xip_psram_esp32s3 b/components/esp_mm/test_apps/mm/sdkconfig.ci.xip_psram_esp32s3
new file mode 100644
index 0000000000..6f32b5596f
--- /dev/null
+++ b/components/esp_mm/test_apps/mm/sdkconfig.ci.xip_psram_esp32s3
@@ -0,0 +1,8 @@
+CONFIG_IDF_TARGET="esp32s3"
+CONFIG_COMPILER_OPTIMIZATION_SIZE=y
+CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
+CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y
+
+CONFIG_SPIRAM=y
+CONFIG_SPIRAM_FETCH_INSTRUCTIONS=y
+CONFIG_SPIRAM_RODATA=y
diff --git a/components/spi_flash/test_apps/flash_encryption/sdkconfig.ci.release_f4r8 b/components/spi_flash/test_apps/flash_encryption/sdkconfig.ci.release_f4r8
index 63a6a812ad..631abe22f8 100644
--- a/components/spi_flash/test_apps/flash_encryption/sdkconfig.ci.release_f4r8
+++ b/components/spi_flash/test_apps/flash_encryption/sdkconfig.ci.release_f4r8
@@ -1,3 +1,4 @@
+CONFIG_IDF_TARGET="esp32s3"
 CONFIG_ESP_TASK_WDT_EN=n
 CONFIG_FREERTOS_USE_TICKLESS_IDLE=y
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
diff --git a/components/spi_flash/test_apps/flash_encryption/sdkconfig.ci.release_f8r8 b/components/spi_flash/test_apps/flash_encryption/sdkconfig.ci.release_f8r8
index 5acf0f9f59..840771961e 100644
--- a/components/spi_flash/test_apps/flash_encryption/sdkconfig.ci.release_f8r8
+++ b/components/spi_flash/test_apps/flash_encryption/sdkconfig.ci.release_f8r8
@@ -1,3 +1,4 @@
+CONFIG_IDF_TARGET="esp32s3"
 CONFIG_ESP_TASK_WDT_EN=n
 CONFIG_FREERTOS_USE_TICKLESS_IDLE=y
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
diff --git a/components/spi_flash/test_apps/flash_mmap/pytest_flash_mmap.py b/components/spi_flash/test_apps/flash_mmap/pytest_flash_mmap.py
index 0523bcf537..782d0091b2 100644
--- a/components/spi_flash/test_apps/flash_mmap/pytest_flash_mmap.py
+++ b/components/spi_flash/test_apps/flash_mmap/pytest_flash_mmap.py
@@ -35,16 +35,14 @@ def test_flash_mmap_rom_impl(dut: Dut) -> None:
     dut.run_all_single_board_cases(timeout=30)
 
 
-@pytest.mark.esp32s2
-@pytest.mark.esp32s3
+XIP_CONFIGS = [
+    pytest.param('xip_psram_esp32s2', marks=[pytest.mark.esp32s2]),
+    pytest.param('xip_psram_esp32s3', marks=[pytest.mark.esp32s3]),
+]
+
+
 @pytest.mark.generic
-@pytest.mark.parametrize(
-    'config',
-    [
-        'xip_psram',
-    ],
-    indirect=True,
-)
+@pytest.mark.parametrize('config', XIP_CONFIGS, indirect=True)
 def test_flash_mmap_xip_psram(dut: Dut) -> None:
     dut.run_all_single_board_cases(timeout=30)
 
diff --git a/components/spi_flash/test_apps/flash_mmap/sdkconfig.ci.xip_psram b/components/spi_flash/test_apps/flash_mmap/sdkconfig.ci.xip_psram_esp32s2
similarity index 67%
rename from components/spi_flash/test_apps/flash_mmap/sdkconfig.ci.xip_psram
rename to components/spi_flash/test_apps/flash_mmap/sdkconfig.ci.xip_psram_esp32s2
index e5e840609e..f802481b37 100644
--- a/components/spi_flash/test_apps/flash_mmap/sdkconfig.ci.xip_psram
+++ b/components/spi_flash/test_apps/flash_mmap/sdkconfig.ci.xip_psram_esp32s2
@@ -1,2 +1,3 @@
+CONFIG_IDF_TARGET="esp32s2"
 CONFIG_SPIRAM_FETCH_INSTRUCTIONS=y
 CONFIG_SPIRAM_RODATA=y
diff --git a/components/spi_flash/test_apps/flash_mmap/sdkconfig.ci.xip_psram_esp32s3 b/components/spi_flash/test_apps/flash_mmap/sdkconfig.ci.xip_psram_esp32s3
new file mode 100644
index 0000000000..cd228b8f50
--- /dev/null
+++ b/components/spi_flash/test_apps/flash_mmap/sdkconfig.ci.xip_psram_esp32s3
@@ -0,0 +1,3 @@
+CONFIG_IDF_TARGET="esp32s3"
+CONFIG_SPIRAM_FETCH_INSTRUCTIONS=y
+CONFIG_SPIRAM_RODATA=y
diff --git a/examples/peripherals/usb/device/tusb_msc/sdkconfig.defaults b/examples/peripherals/usb/device/tusb_msc/sdkconfig.defaults
index 74355e7a93..cdfeb1a1cf 100644
--- a/examples/peripherals/usb/device/tusb_msc/sdkconfig.defaults
+++ b/examples/peripherals/usb/device/tusb_msc/sdkconfig.defaults
@@ -1,7 +1,6 @@
 # This file was generated using idf.py save-defconfig. It can be edited manually.
 # Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration
 #
-CONFIG_TINYUSB=y
 CONFIG_TINYUSB_MSC_ENABLED=y
 
 CONFIG_PARTITION_TABLE_CUSTOM=y