diff --git a/tests/suites/test_suite_psa_crypto_persistent_key.data b/tests/suites/test_suite_psa_crypto_persistent_key.data
index 133e726aec..7f4f27df90 100644
--- a/tests/suites/test_suite_psa_crypto_persistent_key.data
+++ b/tests/suites/test_suite_psa_crypto_persistent_key.data
@@ -33,6 +33,9 @@ parse_storage_data_check:"505341004b45590000000000010000000170000001000000000000
 Parse storage: truncated key
 parse_storage_data_check:"505341004b455900000000000100000001700000010000000000001200000010620200003082025e02010002818100af057d396ee84fb75fdbb5c2b13c7fe5a654aa8aa2470b541ee1feb0b12d25c79711531249e1129628042dbbb6c120d1443524ef4c0e6e1d8956eeb2077af12349ddeee54483bc06c2c61948cd02b202e796aebd94d3a7cbf859c2c1819c324cb82b9cd34ede263a2abffe4733f077869e8660f7d6834da53d690ef7985f6bc3020301000102818100874bf0ffc2f2a71d14671ddd0171c954d7fdbf50281e4f6d99ea0e1ebcf82faa58e7b595ffb293d1abe17f110b37c48cc0f36c37e84d876621d327f64bbe08457d3ec4098ba2fa0a319fba411c2841ed7be83196a8cdf9daa5d00694bc335fc4c32217fe0488bce9cb7202e59468b1ead119000477db2ca797fac19eda3f58c1024100e2ab760841bb9d30a81d222de1eb7381d82214407f1b975cbbfe4e1a9467fd98adbd78f607836ca5be1928b9d160d97fd45c12d6b52e2c9871a174c66b488113024100c5ab27602159ae7d6f20c3c2ee851e46dc112e689e28d5fcbbf990a99ef8a90b8bb44fd36467e7fc1789ceb663abda338652c3c73f111774902e840565927091024100b6cdbd354f7df579a63b48b3643e353b84898777b48b15f94e0bfc0567a6ae5911d57ad6409cf7647bf96264e9bd87eb95e263b7110b9a1f9f94acced0fafa4d024071195eec37e8d257decfc672b07ae639f10cbb9b0c739d0c809968d644a94e3fd6ed9287077a14583f379058f76a8aecd43c62dc8c0f41766650d725275ac4a1024100bb32d133edc2e048d463388b7be9cb4be29f4b6250be603e70e3647501c97ddde20a4e71be95fd5e71784e25aca4baf25be5738aae59bbfe1c997781447a2b":"":PSA_KEY_LIFETIME_PERSISTENT:PSA_KEY_TYPE_RSA_KEY_PAIR:0:PSA_KEY_USAGE_EXPORT:PSA_ALG_CATEGORY_ASYMMETRIC_ENCRYPTION:PSA_ALG_CATEGORY_SIGN:PSA_ERROR_DATA_INVALID
 
+Key identifier ranges
+key_id_ranges:
+
 # Not specific to files, but only run this test in an environment where the maximum size could be reached.
 Save maximum-size persistent raw key
 depends_on:MBEDTLS_PSA_ITS_FILE_C
diff --git a/tests/suites/test_suite_psa_crypto_persistent_key.function b/tests/suites/test_suite_psa_crypto_persistent_key.function
index ea8cb6bc8f..f767db9fcd 100644
--- a/tests/suites/test_suite_psa_crypto_persistent_key.function
+++ b/tests/suites/test_suite_psa_crypto_persistent_key.function
@@ -117,6 +117,42 @@ exit:
 }
 /* END_CASE */
 
+/* BEGIN_CASE */
+void key_id_ranges()
+{
+    /* PSA Crypto API specification */
+    TEST_EQUAL(PSA_KEY_ID_NULL, 0x00000000);
+    TEST_EQUAL(PSA_KEY_ID_USER_MIN, 0x00000001);
+    TEST_EQUAL(PSA_KEY_ID_USER_MAX, 0x3fffffff);
+    TEST_EQUAL(PSA_KEY_ID_VENDOR_MIN, 0x40000000);
+    TEST_EQUAL(PSA_KEY_ID_VENDOR_MAX, 0x7fffffff);
+
+    /* Volatile key IDs */
+    TEST_LE_U(PSA_KEY_ID_VENDOR_MIN, PSA_KEY_ID_VOLATILE_MIN);
+    TEST_LE_U(PSA_KEY_ID_VOLATILE_MAX, PSA_KEY_ID_VENDOR_MAX);
+    TEST_LE_U(PSA_KEY_ID_VOLATILE_MIN, PSA_KEY_ID_VOLATILE_MAX);
+
+    /* Built-in key IDs */
+    /* Mbed TLS 2.27 reserved  0x7fff0000..0x7fffefff for built-in keys.
+     * Integrators may have hard-coded built-in key IDs in this range,
+     * so if this range starts conflicting with something else, it's
+     * an incompatible change. */
+#if defined(MBEDTLS_PSA_CRYPTO_BUILTIN_KEYS)
+    TEST_LE_U(MBEDTLS_PSA_KEY_ID_BUILTIN_MIN, 0x7fff0000);
+    TEST_LE_U(MBEDTLS_PSA_KEY_ID_BUILTIN_MAX, 0x7fffefff);
+    TEST_LE_U(PSA_KEY_ID_VENDOR_MIN, MBEDTLS_PSA_KEY_ID_BUILTIN_MIN);
+    TEST_LE_U(MBEDTLS_PSA_KEY_ID_BUILTIN_MAX, PSA_KEY_ID_VENDOR_MAX);
+#endif /* MBEDTLS_PSA_CRYPTO_BUILTIN_KEYS */
+    /* To avoid confusion, make sure we avoid the built-in key ID range
+     * even in builds without built-in keys.. */
+    if (PSA_KEY_ID_VOLATILE_MIN <= 0x7fff0000) {
+        TEST_LE_U(PSA_KEY_ID_VOLATILE_MAX + 1, 0x7fff0000);
+    } else {
+        TEST_LE_U(0x7fffefff + 1, PSA_KEY_ID_VOLATILE_MIN);
+    }
+}
+/* END_CASE */
+
 /* BEGIN_CASE */
 void save_large_persistent_key(int data_length_arg, int expected_status)
 {