diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c
index 28cc8c2ee..27f26cd3a 100644
--- a/wolfcrypt/test/test.c
+++ b/wolfcrypt/test/test.c
@@ -55361,7 +55361,7 @@ static wc_test_ret_t mp_test_shift(mp_int* a, mp_int* r1, WC_RNG* rng)
         return WC_TEST_RET_ENC_EC(ret);
     for (i = 0; i < 4; i++) {
         ret = mp_copy(r1, a);
-        if (ret != WC_NO_ERR_TRACE(MP_VAL))
+        if (ret != MP_OKAY)
             return WC_TEST_RET_ENC_EC(ret);
 #if !defined(NO_DH) || defined(HAVE_ECC) || (!defined(NO_RSA) && \
     defined(WC_RSA_BLINDING) && !defined(WOLFSSL_RSA_VERIFY_ONLY))
@@ -56788,7 +56788,7 @@ static wc_test_ret_t mp_test_shbd(mp_int* a, mp_int* b, WC_RNG* rng)
             if (ret != MP_OKAY)
                 return WC_TEST_RET_ENC_EC(ret);
             ret = mp_copy(a, b);
-            if (ret != WC_NO_ERR_TRACE(MP_VAL))
+            if (ret != MP_OKAY)
                 return WC_TEST_RET_ENC_EC(ret);
             for (k = 0; k <= DIGIT_BIT * 2; k++) {
                 ret = mp_mul_2d(a, k, a);
@@ -56809,7 +56809,7 @@ static wc_test_ret_t mp_test_shbd(mp_int* a, mp_int* b, WC_RNG* rng)
             if (ret != MP_OKAY)
                 return WC_TEST_RET_ENC_EC(ret);
             ret = mp_copy(a, b);
-            if (ret != WC_NO_ERR_TRACE(MP_VAL))
+            if (ret != MP_OKAY)
                 return WC_TEST_RET_ENC_EC(ret);
             for (k = 0; k < 10; k++) {
                 ret = mp_lshd(a, k);
@@ -57605,7 +57605,7 @@ static wc_test_ret_t mp_test_exptmod(mp_int* b, mp_int* e, mp_int* m, mp_int* r)
     mp_add_d(b, 1, b);
     mp_set(e, 0x3);
     ret = mp_copy(b, m);
-    if (ret != WC_NO_ERR_TRACE(MP_VAL))
+    if (ret != MP_OKAY)
         return WC_TEST_RET_ENC_EC(ret);
     ret = mp_exptmod_ex(b, e, 1, m, r);
     if (ret != MP_OKAY)