diff --git a/.gitlab/ci/dependencies/dependencies.yml b/.gitlab/ci/dependencies/dependencies.yml
index 806654928f..20adde4dfe 100644
--- a/.gitlab/ci/dependencies/dependencies.yml
+++ b/.gitlab/ci/dependencies/dependencies.yml
@@ -120,7 +120,6 @@
       - usb       # USB Device & Host tests
       - adc       # pytest*adc*
       - ecdsa
-      - nvs_encr_hmac
   patterns:
     - "{0}-{1}-{2}"
     - "{0}-{2}"
diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml
index d0faa3bea6..3700ecf93d 100644
--- a/.gitlab/ci/rules.yml
+++ b/.gitlab/ci/rules.yml
@@ -285,18 +285,6 @@
   - "components/{hal,efuse}/*"
   - "components/mbedtls/port/ecdsa/*"
 
-.patterns-component_ut-nvs_encr_hmac: &patterns-component_ut-nvs_encr_hmac
-  - "components/nvs_flash/**/*"
-  - "components/nvs_sec_provider/**/*"
-
-.patterns-example_test-nvs_encr_hmac: &patterns-example_test-nvs_encr_hmac
-  - "components/{nvs_flash,nvs_sec_provider}/???[!t]*/**/*"
-  - "components/{nvs_flash,nvs_sec_provider}/??[!s]?*/**/*"
-  - "components/{nvs_flash,nvs_sec_provider}/???/**/*"
-  - "components/{nvs_flash,nvs_sec_provider}/??/**/*"
-  - "components/{nvs_flash,nvs_sec_provider}/*"
-  - "examples/security/nvs_encryption_hmac/**/*"
-
 ##############
 # if anchors #
 ##############
@@ -1616,8 +1604,6 @@
       changes: *patterns-component_ut
     - <<: *if-dev-push
       changes: *patterns-component_ut-adc
-    - <<: *if-dev-push
-      changes: *patterns-component_ut-nvs_encr_hmac
     - <<: *if-dev-push
       changes: *patterns-component_ut-sdio
     - <<: *if-dev-push
@@ -1636,8 +1622,6 @@
       changes: *patterns-example_test-adc
     - <<: *if-dev-push
       changes: *patterns-example_test-ethernet
-    - <<: *if-dev-push
-      changes: *patterns-example_test-nvs_encr_hmac
     - <<: *if-dev-push
       changes: *patterns-example_test-sdio
     - <<: *if-dev-push
@@ -1776,19 +1760,6 @@
     - <<: *if-dev-push
       changes: *patterns-target_test-adc
 
-.rules:test:component_ut-esp32c3-nvs_encr_hmac:
-  rules:
-    - <<: *if-revert-branch
-      when: never
-    - <<: *if-protected
-    - <<: *if-label-build-only
-      when: never
-    - <<: *if-label-component_ut
-    - <<: *if-label-component_ut_esp32c3
-    - <<: *if-label-target_test
-    - <<: *if-dev-push
-      changes: *patterns-component_ut-nvs_encr_hmac
-
 .rules:test:component_ut-esp32c3-sdio:
   rules:
     - <<: *if-revert-branch
@@ -2324,19 +2295,6 @@
       when: never
     - <<: *if-example_test-ota-include_nightly_run-rule
 
-.rules:test:example_test-esp32c3-nvs_encr_hmac:
-  rules:
-    - <<: *if-revert-branch
-      when: never
-    - <<: *if-protected
-    - <<: *if-label-build-only
-      when: never
-    - <<: *if-label-example_test
-    - <<: *if-label-example_test_esp32c3
-    - <<: *if-label-target_test
-    - <<: *if-dev-push
-      changes: *patterns-example_test-nvs_encr_hmac
-
 .rules:test:example_test-esp32c3-sdio:
   rules:
     - <<: *if-revert-branch
diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml
index 640d97c998..a65167ab7a 100644
--- a/.gitlab/ci/target-test.yml
+++ b/.gitlab/ci/target-test.yml
@@ -544,15 +544,6 @@ pytest_examples_esp32c3_flash_encryption:
       artifacts: false
   tags: [ esp32c3, flash_encryption ]
 
-pytest_examples_esp32c3_nvs_encr_hmac:
-  extends:
-    - .pytest_examples_dir_template
-    - .rules:test:example_test-esp32c3-nvs_encr_hmac
-  needs:
-    - job: build_pytest_examples_esp32c3
-      artifacts: false
-  tags: [ esp32c3, nvs_encr_hmac ]
-
 pytest_examples_esp32s2_usb_device:
   extends:
     - .pytest_examples_dir_template
@@ -1142,15 +1133,6 @@ pytest_components_esp32c3_flash_encryption:
       artifacts: false
   tags: [ esp32c3, flash_encryption ]
 
-pytest_components_esp32c3_nvs_encr_hmac:
-  extends:
-    - .pytest_components_dir_template
-    - .rules:test:component_ut-esp32c3-nvs_encr_hmac
-  needs:
-    - job: build_pytest_components_esp32c3
-      artifacts: false
-  tags: [ esp32c3, nvs_encr_hmac ]
-
 pytest_components_esp32_sdspi:
   extends:
     - .pytest_components_dir_template
diff --git a/examples/security/.build-test-rules.yml b/examples/security/.build-test-rules.yml
index e24e449691..81f7d70edd 100644
--- a/examples/security/.build-test-rules.yml
+++ b/examples/security/.build-test-rules.yml
@@ -13,3 +13,8 @@ examples/security/nvs_encryption_hmac:
     - if: IDF_TARGET not in ["esp32c3"]
       temporary: true
       reason: lack of runners
+  depends_components:
+    - nvs_flash
+    - nvs_sec_provider
+  depends_filepatterns:
+    - examples/security/nvs_encryption_hmac/**/*