diff --git a/host/xtest/regression_4000.c b/host/xtest/regression_4000.c
index 4c5ca0779..757a24dc4 100644
--- a/host/xtest/regression_4000.c
+++ b/host/xtest/regression_4000.c
@@ -3734,310 +3734,335 @@ static const struct xtest_ac_case xtest_ac_cases_dsa[] = {
 
 static const struct xtest_ac_case xtest_ac_cases_ecdsa[] = {
 	/* ECDSA tests */
-	/* [P-192] */
-	XTEST_AC_ECC_CASE(0, TEE_ALG_ECDSA_P192, TEE_MODE_VERIFY,
+	/* [P-192] with SHA1 hash using legacy algo ID __OPTEE_ALG_ECDSA_P192 */
+	XTEST_AC_ECC_CASE(0, __OPTEE_ALG_ECDSA_P192, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_1),
-	XTEST_AC_ECC_CASE(0, TEE_ALG_ECDSA_P192, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(0, __OPTEE_ALG_ECDSA_P192, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_1),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P192, TEE_MODE_VERIFY,
+	/* [P-192] with SHA1 hash */
+	XTEST_AC_ECC_CASE(0, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
+			  nist_186_2_ecdsa_testvector_1),
+	XTEST_AC_ECC_CASE(0, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
+			  nist_186_2_ecdsa_testvector_1),
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_2),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P192, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_2),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P192, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_3),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P192, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_3),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P192, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_4),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P192, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_4),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P192, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_5),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P192, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_5),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P192, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_6),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P192, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_6),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P192, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_7),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P192, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_7),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P192, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_8),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P192, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_8),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P192, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_9),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P192, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_9),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P192, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_10),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P192, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_10),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P192, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_11),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P192, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_11),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P192, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_12),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P192, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_12),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P192, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_13),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P192, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_13),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P192, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_14),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P192, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_14),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P192, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_15),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P192, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_15),
-	/* [P-224] */
-	XTEST_AC_ECC_CASE(1, TEE_ALG_ECDSA_P224, TEE_MODE_VERIFY,
+	/* [P-224] with SHA1 hash using legacy algo ID __OPTEE_ALG_ECDSA_P224 */
+	XTEST_AC_ECC_CASE(1, __OPTEE_ALG_ECDSA_P224, TEE_MODE_VERIFY,
+			  nist_186_2_ecdsa_testvector_16),
+	XTEST_AC_ECC_CASE(1, __OPTEE_ALG_ECDSA_P224, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_16),
-	XTEST_AC_ECC_CASE(1, TEE_ALG_ECDSA_P224, TEE_MODE_SIGN,
+	/* [P-224] with SHA1 hash */
+	XTEST_AC_ECC_CASE(1, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_16),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P224, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(1, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
+			  nist_186_2_ecdsa_testvector_16),
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_17),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P224, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_17),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P224, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_18),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P224, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_18),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P224, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_19),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P224, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_19),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P224, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_20),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P224, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_20),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P224, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_21),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P224, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_21),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P224, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_22),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P224, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_22),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P224, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_23),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P224, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_23),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P224, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_24),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P224, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_24),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P224, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_25),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P224, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_25),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P224, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_26),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P224, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_26),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P224, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_27),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P224, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_27),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P224, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_28),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P224, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_28),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P224, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_29),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P224, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_29),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P224, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_30),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P224, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_30),
-	/* [P-256] */
-	XTEST_AC_ECC_CASE(1, TEE_ALG_ECDSA_P256, TEE_MODE_VERIFY,
+	/* [P-256] with SHA1 hash using legacy algo ID __OPTEE_ALG_ECDSA_P256 */
+	XTEST_AC_ECC_CASE(1, __OPTEE_ALG_ECDSA_P256, TEE_MODE_VERIFY,
+			  nist_186_2_ecdsa_testvector_31),
+	XTEST_AC_ECC_CASE(1, __OPTEE_ALG_ECDSA_P256, TEE_MODE_SIGN,
+			  nist_186_2_ecdsa_testvector_31),
+	/* [P-256] with SHA1 hash */
+	XTEST_AC_ECC_CASE(1, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_31),
-	XTEST_AC_ECC_CASE(1, TEE_ALG_ECDSA_P256, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(1, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_31),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P256, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_32),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P256, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_32),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P256, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_33),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P256, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_33),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P256, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_34),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P256, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_34),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P256, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_35),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P256, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_35),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P256, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_36),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P256, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_36),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P256, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_37),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P256, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_37),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P256, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_38),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P256, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_38),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P256, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_39),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P256, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_39),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P256, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_40),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P256, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_40),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P256, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_41),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P256, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_41),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P256, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_42),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P256, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_42),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P256, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_43),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P256, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_43),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P256, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_44),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P256, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_44),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P256, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_45),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P256, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_45),
-	/* [P-384] */
-	XTEST_AC_ECC_CASE(1, TEE_ALG_ECDSA_P384, TEE_MODE_VERIFY,
+	/* [P-384] with SHA1 hash using legacy algo ID __OPTEE_ALG_ECDSA_P384 */
+	XTEST_AC_ECC_CASE(1, __OPTEE_ALG_ECDSA_P384, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_46),
-	XTEST_AC_ECC_CASE(1, TEE_ALG_ECDSA_P384, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(1, __OPTEE_ALG_ECDSA_P384, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_46),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P384, TEE_MODE_VERIFY,
+	/* [P-384] with SHA1 hash */
+	XTEST_AC_ECC_CASE(1, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
+			  nist_186_2_ecdsa_testvector_46),
+	XTEST_AC_ECC_CASE(1, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
+			  nist_186_2_ecdsa_testvector_46),
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_47),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P384, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_47),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P384, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_48),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P384, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_48),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P384, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_49),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P384, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_49),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P384, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_50),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P384, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_50),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P384, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_51),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P384, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_51),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P384, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_52),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P384, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_52),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P384, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_53),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P384, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_53),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P384, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_54),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P384, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_54),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P384, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_55),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P384, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_55),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P384, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_56),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P384, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_56),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P384, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_57),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P384, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_57),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P384, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_58),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P384, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_58),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P384, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_59),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P384, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_59),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P384, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_60),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P384, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_60),
-	/* [P-521] */
-	XTEST_AC_ECC_CASE(1, TEE_ALG_ECDSA_P521, TEE_MODE_VERIFY,
+	/* [P-521] with SHA1 hash using legacy algo ID __OPTEE_ALG_ECDSA_P521 */
+	XTEST_AC_ECC_CASE(1, __OPTEE_ALG_ECDSA_P521, TEE_MODE_VERIFY,
+			  nist_186_2_ecdsa_testvector_61),
+	XTEST_AC_ECC_CASE(1, __OPTEE_ALG_ECDSA_P521, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_61),
-	XTEST_AC_ECC_CASE(1, TEE_ALG_ECDSA_P521, TEE_MODE_SIGN,
+	/* [P-521] with SHA1 hash */
+	XTEST_AC_ECC_CASE(1, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_61),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P521, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(1, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
+			  nist_186_2_ecdsa_testvector_61),
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_62),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P521, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_62),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P521, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_63),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P521, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_63),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P521, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_64),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P521, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_64),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P521, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_65),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P521, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_65),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P521, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_66),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P521, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_66),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P521, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_67),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P521, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_67),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P521, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_68),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P521, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_68),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P521, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_69),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P521, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_69),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P521, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_70),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P521, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_70),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P521, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_71),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P521, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_71),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P521, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_72),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P521, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_72),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P521, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_73),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P521, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_73),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P521, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_74),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P521, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_74),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P521, TEE_MODE_VERIFY,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_VERIFY,
 			  nist_186_2_ecdsa_testvector_75),
-	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_P521, TEE_MODE_SIGN,
+	XTEST_AC_ECC_CASE(15, TEE_ALG_ECDSA_SHA1, TEE_MODE_SIGN,
 			  nist_186_2_ecdsa_testvector_75),
 	/* [K-163] - GP NOT SUPPORTED */
 	/* [K-233] - GP NOT SUPPORTED */
@@ -4186,6 +4211,11 @@ static void xtest_tee_test_4006(ADBG_Case_t *c,
 		 * the payload.
 		 */
 		if (tv->mode == TEE_MODE_VERIFY || tv->mode == TEE_MODE_SIGN) {
+			/*
+			 * Current ECDSA tests are based on SHA1 hashed payload.
+			 * Current RSASSA_PKCS1_V1_5 tests are based on SHA256
+			 * hashed payload.
+			 */
 			if (TEE_ALG_GET_MAIN_ALG(tv->algo) == TEE_MAIN_ALGO_ECDSA)
 				hash_algo = TEE_ALG_SHA1;
 #if defined(CFG_CRYPTO_RSASSA_NA1)
@@ -4351,27 +4381,56 @@ static void xtest_tee_test_4006(ADBG_Case_t *c,
 		case TEE_MAIN_ALGO_SM2_PKE:
 		case TEE_MAIN_ALGO_SM2_DSA_SM3:
 			switch (tv->algo) {
-			case TEE_ALG_ECDSA_P192:
+			case TEE_ALG_ECDSA_SHA1:
+			case TEE_ALG_ECDSA_SHA224:
+			case TEE_ALG_ECDSA_SHA256:
+			case TEE_ALG_ECDSA_SHA384:
+			case TEE_ALG_ECDSA_SHA512:
+				switch (tv->params.ecc.private_len) {
+				case 24:
+					curve = TEE_ECC_CURVE_NIST_P192;
+					break;
+				case 28:
+					curve = TEE_ECC_CURVE_NIST_P224;
+					break;
+				case 32:
+					curve = TEE_ECC_CURVE_NIST_P256;
+					break;
+				case 48:
+					curve = TEE_ECC_CURVE_NIST_P384;
+					break;
+				case 66:
+					curve = TEE_ECC_CURVE_NIST_P521;
+					break;
+				default:
+					/* Unsupported key size */
+					ADBG_EXPECT_TRUE(c, false);
+					goto out;
+				}
+				pub_key_type = TEE_TYPE_ECDSA_PUBLIC_KEY;
+				priv_key_type = TEE_TYPE_ECDSA_KEYPAIR;
+				break;
+			case __OPTEE_ALG_ECDSA_P192:
 				curve = TEE_ECC_CURVE_NIST_P192;
 				pub_key_type = TEE_TYPE_ECDSA_PUBLIC_KEY;
 				priv_key_type = TEE_TYPE_ECDSA_KEYPAIR;
 				break;
-			case TEE_ALG_ECDSA_P224:
+			case __OPTEE_ALG_ECDSA_P224:
 				curve = TEE_ECC_CURVE_NIST_P224;
 				pub_key_type = TEE_TYPE_ECDSA_PUBLIC_KEY;
 				priv_key_type = TEE_TYPE_ECDSA_KEYPAIR;
 				break;
-			case TEE_ALG_ECDSA_P256:
+			case __OPTEE_ALG_ECDSA_P256:
 				curve = TEE_ECC_CURVE_NIST_P256;
 				pub_key_type = TEE_TYPE_ECDSA_PUBLIC_KEY;
 				priv_key_type = TEE_TYPE_ECDSA_KEYPAIR;
 				break;
-			case TEE_ALG_ECDSA_P384:
+			case __OPTEE_ALG_ECDSA_P384:
 				curve = TEE_ECC_CURVE_NIST_P384;
 				pub_key_type = TEE_TYPE_ECDSA_PUBLIC_KEY;
 				priv_key_type = TEE_TYPE_ECDSA_KEYPAIR;
 				break;
-			case TEE_ALG_ECDSA_P521:
+			case __OPTEE_ALG_ECDSA_P521:
 				curve = TEE_ECC_CURVE_NIST_P521;
 				pub_key_type = TEE_TYPE_ECDSA_PUBLIC_KEY;
 				priv_key_type = TEE_TYPE_ECDSA_KEYPAIR;
@@ -4391,7 +4450,7 @@ static void xtest_tee_test_4006(ADBG_Case_t *c,
 				break;
 			}
 
-			if (tv->algo == TEE_ALG_ECDSA_P521)
+			if (curve == TEE_ECC_CURVE_NIST_P521)
 				max_key_size = 521;
 			else
 				max_key_size = tv->params.ecc.private_len * 8;