diff --git a/tests/suites/test_suite_ecp.function b/tests/suites/test_suite_ecp.function
index eb55f01c4..0326f1f66 100644
--- a/tests/suites/test_suite_ecp.function
+++ b/tests/suites/test_suite_ecp.function
@@ -67,15 +67,6 @@ inline static int mbedtls_ecp_group_cmp(mbedtls_ecp_group *grp1,
     return 0;
 }
 
-#if defined(MBEDTLS_TEST_HOOKS) && \
-    (defined(MBEDTLS_ECP_DP_SECP192R1_ENABLED) || \
-    defined(MBEDTLS_ECP_DP_SECP224R1_ENABLED) || \
-    defined(MBEDTLS_ECP_DP_SECP256R1_ENABLED) || \
-    defined(MBEDTLS_ECP_DP_SECP384R1_ENABLED) || \
-    defined(MBEDTLS_ECP_DP_SECP521R1_ENABLED))
-#define MBEDTLS_ECP_DP_SECP_GENERIC_ENABLED
-#endif
-
 /* END_HEADER */
 
 /* BEGIN_DEPENDENCIES
@@ -1275,7 +1266,7 @@ exit:
 }
 /* END_CASE */
 
-/* BEGIN_CASE depends_on:MBEDTLS_TEST_HOOKS:MBEDTLS_ECP_DP_SECP_GENERIC_ENABLED */
+/* BEGIN_CASE depends_on:MBEDTLS_TEST_HOOKS */
 void ecp_mod_p_generic_raw(int curve_id,
                            char *input_N,
                            char *input_X,
@@ -1347,7 +1338,7 @@ void ecp_mod_p_generic_raw(int curve_id,
 
     TEST_EQUAL(mbedtls_mpi_mod_modulus_setup(
                    &m, N, limbs_N,
-                   MBEDTLS_MPI_MOD_REP_MONTGOMERY), 0);
+                   MBEDTLS_MPI_MOD_REP_OPT_RED), 0);
 
     TEST_EQUAL((*curve_func)(X, limbs_X), 0);