diff --git a/components/esp_security/test_apps/.build-test-rules.yml b/components/esp_security/test_apps/.build-test-rules.yml
index 966a8b2be8..f8ed3c9d42 100644
--- a/components/esp_security/test_apps/.build-test-rules.yml
+++ b/components/esp_security/test_apps/.build-test-rules.yml
@@ -2,11 +2,7 @@
 
 components/esp_security/test_apps/crypto_drivers:
   enable:
-    - if: ((SOC_HMAC_SUPPORTED == 1) or (SOC_DIG_SIGN_SUPPORTED == 1)) or (SOC_KEY_MANAGER_SUPPORTED == 1)
-  disable_test:
-    - if: IDF_TARGET == "esp32p4"
-      temporary: true
-      reason: p4 rev3 migration # TODO: IDF-14418
+    - if: ((SOC_HMAC_SUPPORTED == 1) or (SOC_DIG_SIGN_SUPPORTED == 1)) or (SOC_KEY_MANAGER_SUPPORTED == 1)g
   depends_components:
-    - *common_components
     - esp_security
+    - esp_hal_security
diff --git a/components/esp_security/test_apps/crypto_drivers/pytest_crypto_drivers.py b/components/esp_security/test_apps/crypto_drivers/pytest_crypto_drivers.py
index 59dc1fdf66..8e697da9af 100644
--- a/components/esp_security/test_apps/crypto_drivers/pytest_crypto_drivers.py
+++ b/components/esp_security/test_apps/crypto_drivers/pytest_crypto_drivers.py
@@ -9,6 +9,5 @@ from pytest_embedded_idf.utils import idf_parametrize
 @idf_parametrize(
     'target', ['esp32s2', 'esp32s3', 'esp32c3', 'esp32c6', 'esp32h2', 'esp32p4', 'esp32c5'], indirect=['target']
 )
-@pytest.mark.temp_skip_ci(targets=['esp32p4'], reason='p4 rev3 migration # TODO: IDF-14418')
 def test_crypto_drivers(dut: Dut) -> None:
     dut.run_all_single_board_cases(timeout=180)
diff --git a/components/mbedtls/test_apps/.build-test-rules.yml b/components/mbedtls/test_apps/.build-test-rules.yml
index bdae617dd0..330d7f7f76 100644
--- a/components/mbedtls/test_apps/.build-test-rules.yml
+++ b/components/mbedtls/test_apps/.build-test-rules.yml
@@ -12,7 +12,9 @@ components/mbedtls/test_apps:
     - if: CONFIG_NAME == "psram_all_ext_flash_enc" and IDF_TARGET not in ["esp32", "esp32p4", "esp32c5"]
       reason: lack of runners
   depends_components:
-    - *common_components
     - mbedtls
     - esp_security
+    - esp_hal_security
+    - esp_driver_dma
+    - esp_hal_dma
     - esp_mm