diff --git a/scripts/all-core.sh b/scripts/all-core.sh
index a9070a8e2..8ace21fd1 100644
--- a/scripts/all-core.sh
+++ b/scripts/all-core.sh
@@ -933,6 +933,14 @@ pseudo_component_error_test () {
     false "this should not be executed"
 }
 
+# On our CI, we do some hacky stuff with git submodules, and some
+# submodules might be missing.
+clone_any_missing_submodules () {
+    script='IFS="
+"; sm=$(git submodule status | sed -n "s/^-[^ ]* //p"); if [ ! -z "$sm" ]; then git submodule update --init $sm; fi'
+    (eval "$script") && git submodule foreach --recursive "$script"
+}
+
 # Run one component and clean up afterwards.
 run_component () {
     current_component="$1"
@@ -960,6 +968,8 @@ run_component () {
         pre_create_tf_psa_crypto_out_of_source_directory
     fi
 
+    clone_any_missing_submodules
+
     # Run the component in a subshell, with error trapping and output
     # redirection set up based on the relevant options.
     if [ $KEEP_GOING -eq 1 ]; then
diff --git a/scripts/mbedtls_framework/psa_storage.py b/scripts/mbedtls_framework/psa_storage.py
index 60881ea89..69e242330 100644
--- a/scripts/mbedtls_framework/psa_storage.py
+++ b/scripts/mbedtls_framework/psa_storage.py
@@ -51,6 +51,7 @@ def update_cache(self) -> None:
                 includes.append('drivers/builtin/include')
                 includes.append('drivers/everest/include')
                 includes.append('drivers/everest/include/tf-psa-crypto/private/')
+                includes.append('drivers/pqcp/include')
             elif not build_tree.is_mbedtls_3_6():
                 includes.append('tf-psa-crypto/include')
                 includes.append('tf-psa-crypto/drivers/builtin/include')
diff --git a/scripts/test_psa_constant_names.py b/scripts/test_psa_constant_names.py
index 7aef3c420..a74104781 100755
--- a/scripts/test_psa_constant_names.py
+++ b/scripts/test_psa_constant_names.py
@@ -175,6 +175,7 @@ def main():
                                                       'tf-psa-crypto/drivers/everest/include',
                                                       'tf-psa-crypto/drivers/everest/include/' +
                                                       'tf-psa-crypto/private',
+                                                      'tf-psa-crypto/drivers/pqcp/include',
                                                       'include'],
                             help='Directory for header files')
     parser.add_argument('--keep-c',