diff --git a/tests/src/drivers/test_driver_signature.c b/tests/src/drivers/test_driver_signature.c
index 6ff2ad9c2..7647c9c65 100644
--- a/tests/src/drivers/test_driver_signature.c
+++ b/tests/src/drivers/test_driver_signature.c
@@ -39,13 +39,28 @@
 #include LIBTESTDRIVER1_PSA_DRIVER_INTERNAL_HEADER(psa_crypto_rsa.h)
 #endif
 
-#if defined(TF_PSA_CRYPTO_PQCP_MLDSA_ENABLED)
-/* For PSA_ALG_IS_ML_DSA. Including this internal header will no longer
- * be needed once we add the ML-DSA macro definitions to the public
- * headers.
- * https://github.com/Mbed-TLS/TF-PSA-Crypto/issues/726
+/* This file is part of the framework and needs to be compatible with all
+ * maintained branches of Mbed TLS and TF-PSA-Crypto.
+ *
+ * - Until shortly before TF-PSA-Crypto 1.1.0, ML-DSA does not exist at all.
+ * - In TF-PSA-Crypto 1.1.0, TF_PSA_CRYPTO_PQCP_MLDSA_ENABLED exists, but
+ *   there is no driver dispatch for it yet, so this driver doesn't need to
+ *   worry about ML-DSA.
+ * - Shortly after TF-PSA-Crypto 1.1.0, in
+ *   https://github.com/Mbed-TLS/TF-PSA-Crypto/pull/700, we introduced
+ *   driver dispatch for ML-DSA, but the macro PSA_ALG_IS_ML_DSA is not
+ *   in the API yet, only in a private header. Including this private header
+ *   is a pain due to how our various build scripts set up include paths, so
+ *   we don't do it. Instead, define PSA_ALG_IS_ML_DSA manually: it's the
+ *   only thing we need.
+ * - Later we will add ML-DSA to the API, including the definition of
+ *   PSA_ALG_IS_ML_DSA. After that we may also add driver dispatch testing
+ *   for ML-DSA.
  */
-#include "psa_crypto_mldsa.h"
+#if !defined(PSA_ALG_IS_ML_DSA)
+/* Pure ML-DSA (hedged or deterministic) */
+#define PSA_ALG_IS_ML_DSA(alg)                          \
+    ((alg) == 0x06004400u || (alg) == 0x06004500u)
 #endif
 
 #include <string.h>
@@ -222,11 +237,7 @@ psa_status_t mbedtls_test_transparent_signature_sign_message(
         return PSA_SUCCESS;
     }
 
-    /* In TF-PSA-Crypto 1.1.0, TF_PSA_CRYPTO_PQCP_MLDSA_ENABLED and
-     * psa_crypto_mldsa.h already exist, but there is no driver dispatch for
-     * ML-DSA and PSA_ALG_IS_ML_DSA doesn't exist yet. After that, we need
-     * to worry about pure ML-DSA. */
-#if defined(TF_PSA_CRYPTO_PQCP_MLDSA_ENABLED) && defined(PSA_ALG_IS_ML_DSA)
+#if defined(TF_PSA_CRYPTO_PQCP_MLDSA_ENABLED)
     /* Pure ML-DSA is not a sign-the-hash algorithm. At the moment, this
      * function only knows how to deal with sign-the-hash algorithms.
      * So give up and let the next driver in the chain handle the algorithm.
@@ -307,11 +318,7 @@ psa_status_t mbedtls_test_transparent_signature_verify_message(
         return mbedtls_test_driver_signature_verify_hooks.forced_status;
     }
 
-    /* In TF-PSA-Crypto 1.1.0, TF_PSA_CRYPTO_PQCP_MLDSA_ENABLED and
-     * psa_crypto_mldsa.h already exist, but there is no driver dispatch for
-     * ML-DSA and PSA_ALG_IS_ML_DSA doesn't exist yet. After that, we need
-     * to worry about pure ML-DSA. */
-#if defined(TF_PSA_CRYPTO_PQCP_MLDSA_ENABLED) && defined(PSA_ALG_IS_ML_DSA)
+#if defined(TF_PSA_CRYPTO_PQCP_MLDSA_ENABLED)
     /* Pure ML-DSA is not a sign-the-hash algorithm. At the moment, this
      * function only knows how to deal with sign-the-hash algorithms.
      * So give up and let the next driver in the chain handle the algorithm.