diff --git a/mbed-tls-restricted-pr-test-parametrized.yaml b/mbed-tls-restricted-pr-test-parametrized.yaml
index da7c77e..954377a 100644
--- a/mbed-tls-restricted-pr-test-parametrized.yaml
+++ b/mbed-tls-restricted-pr-test-parametrized.yaml
@@ -61,6 +61,12 @@
         default: false
         description: Run the ABI checking test
         name: RUN_ABI_CHECK
+    - bool:
+        default: false
+        description: |
+          Run TF-PSA-Crypto all.sh tests - Only enable if both TF_PSA_CRYPTO_REPO and TF_PSA_CRYPTO_BRANCH are set!
+          Otherwise the test run will fail during BranchInfo gathering.
+        name: RUN_TF_PSA_CRYPTO_ALL_SH
     - string:
         name: TEST_BRANCH
         description: Branch or tag in https://github.com/Mbed-TLS/mbedtls-test.git (forks are not supported)
diff --git a/mbedtls-release-ci-testing.yaml b/mbedtls-release-ci-testing.yaml
index cc80437..e22cfd9 100644
--- a/mbedtls-release-ci-testing.yaml
+++ b/mbedtls-release-ci-testing.yaml
@@ -58,6 +58,12 @@
         name: RUN_WINDOWS_TEST
     - bool:
         default: false
+        description: |
+          Run TF-PSA-Crypto all.sh tests - Only enable if both TF_PSA_CRYPTO_REPO and TF_PSA_CRYPTO_BRANCH are set!
+          Otherwise the test run will fail during BranchInfo gathering.
+        name: RUN_TF_PSA_CRYPTO_ALL_SH
+    - bool:
+        default: false
         description: Push head to coverity branch, triggering a scan (only done for the development branch)
         name: PUSH_COVERITY
     - string: