diff --git a/components/nvs_flash/.build-test-rules.yml b/components/nvs_flash/.build-test-rules.yml
index 93b76378a9..e4bf94a256 100644
--- a/components/nvs_flash/.build-test-rules.yml
+++ b/components/nvs_flash/.build-test-rules.yml
@@ -1,3 +1,9 @@
 components/nvs_flash/host_test:
   enable:
     - if: IDF_TARGET == "linux"
+
+components/nvs_flash/test_apps:
+  disable_test:
+    - if: IDF_TARGET not in ["esp32", "esp32c3"]
+      temporary: true
+      reason: NVS flash test on one Xtensa and one RISCV target is enough
diff --git a/components/vfs/.build-test-rules.yml b/components/vfs/.build-test-rules.yml
new file mode 100644
index 0000000000..e808bae6cb
--- /dev/null
+++ b/components/vfs/.build-test-rules.yml
@@ -0,0 +1,5 @@
+components/vfs/test_apps:
+  disable_test:
+    - if: IDF_TARGET not in ["esp32", "esp32s3", "esp32c2", "esp32c3", "esp32c6", "esp32h2"]
+      temporary: true
+      reason: Only run VFS tests on a subset of targets
diff --git a/components/vfs/test_apps/pytest_vfs.py b/components/vfs/test_apps/pytest_vfs.py
index 6a806483bd..f6854626f7 100644
--- a/components/vfs/test_apps/pytest_vfs.py
+++ b/components/vfs/test_apps/pytest_vfs.py
@@ -1,6 +1,5 @@
-# SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: CC0-1.0
-
 import pytest
 from pytest_embedded import Dut
 
diff --git a/components/vfs/test_apps/sdkconfig.defaults b/components/vfs/test_apps/sdkconfig.defaults
index 728b21c79f..a600d2e6c4 100644
--- a/components/vfs/test_apps/sdkconfig.defaults
+++ b/components/vfs/test_apps/sdkconfig.defaults
@@ -7,3 +7,5 @@ CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
 
 CONFIG_ESP_TASK_WDT_INIT=n
+
+CONFIG_VFS_MAX_COUNT=10