diff --git a/scripts/all-core.sh b/scripts/all-core.sh
index 36776a24c5..0677fdfb80 100644
--- a/scripts/all-core.sh
+++ b/scripts/all-core.sh
@@ -405,9 +405,7 @@ cleanup()
     rm -f programs/test/cmake_package_install/cmake_package_install
 
     # Remove out of source directory
-    if in_tf_psa_crypto_repo; then
-        rm -rf "$OUT_OF_SOURCE_DIR"
-    fi
+    rm -rf "$OUT_OF_SOURCE_DIR"
 
     # Restore files that may have been clobbered by the job
     restore_backed_up_files
diff --git a/scripts/make_generated_files.py b/scripts/make_generated_files.py
index 1ca0f2da72..5dbc92ea88 100755
--- a/scripts/make_generated_files.py
+++ b/scripts/make_generated_files.py
@@ -10,6 +10,7 @@
 """
 import argparse
 import filecmp
+import os
 import shutil
 import subprocess
 import sys
@@ -235,22 +236,30 @@ def main():
 
     args = parser.parse_args()
 
+    if args.root:
+        os.chdir(args.root)
+
     if not build_tree.looks_like_root("."):
         raise RuntimeError("This script must be run from Mbed TLS or TF-PSA-Crypto root.")
 
+    if build_tree.is_mbedtls_3_6():
+        if args.list:
+            subprocess.check_call(['make', 'list_generated_files'])
+        else:
+            subprocess.check_call(['make', 'generated_files'])
+        return
+
     if build_tree.looks_like_tf_psa_crypto_root("."):
         generation_scripts = TF_PSA_CRYPTO_GENERATION_SCRIPTS
-    elif not build_tree.is_mbedtls_3_6():
-        generation_scripts = MBEDTLS_GENERATION_SCRIPTS
     else:
-        raise Exception("No support for Mbed TLS 3.6")
+        generation_scripts = MBEDTLS_GENERATION_SCRIPTS
 
     if args.list:
         files = get_generated_files(generation_scripts)
         for file in files:
             print(str(file))
     elif args.check:
-        check_generated_files(generation_scripts, Path(args.root or "."))
+        check_generated_files(generation_scripts, Path("."))
     else:
         make_generated_files(generation_scripts)
 
diff --git a/scripts/quiet/make b/scripts/quiet/make
index 920e5b875f..ae95dbd20f 100755
--- a/scripts/quiet/make
+++ b/scripts/quiet/make
@@ -12,7 +12,7 @@
 # export VERBOSE_LOGS=1
 
 # don't silence invocations containing these arguments
-NO_SILENCE=" --version | test "
+NO_SILENCE=" --version | list_generated_files | test "
 
 TOOL="make"