diff --git a/tests/api.c b/tests/api.c
index c963004b6..3840f64ae 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -24095,7 +24095,7 @@ static void test_wolfSSL_X509_get_serialNumber(void)
     X509_free(x509); /* free's a */
 
     AssertNotNull(serialHex = BN_bn2hex(bn));
-#ifdef OPENSSL_EXTRA
+#ifndef WC_DISABLE_RADIX_ZERO_PAD
     AssertStrEQ(serialHex, "01");
 #else
     AssertStrEQ(serialHex, "1");
diff --git a/wolfcrypt/src/integer.c b/wolfcrypt/src/integer.c
index 893902b09..e94c36e11 100644
--- a/wolfcrypt/src/integer.c
+++ b/wolfcrypt/src/integer.c
@@ -5233,7 +5233,7 @@ int mp_toradix (mp_int *a, char *str, int radix)
         *str++ = mp_s_rmap[d];
         ++digs;
     }
-#ifdef OPENSSL_EXTRA
+#ifndef WC_DISABLE_RADIX_ZERO_PAD
     /* For hexadecimal output, add zero padding when number of digits is odd */
     if ((digs & 1) && (radix == 16)) {
         *str++ = mp_s_rmap[0];
diff --git a/wolfcrypt/src/tfm.c b/wolfcrypt/src/tfm.c
index 14309c0ef..daa7d070e 100644
--- a/wolfcrypt/src/tfm.c
+++ b/wolfcrypt/src/tfm.c
@@ -4779,7 +4779,7 @@ int mp_toradix (mp_int *a, char *str, int radix)
         *str++ = fp_s_rmap[d];
         ++digs;
     }
-#ifdef OPENSSL_EXTRA
+#ifndef WC_DISABLE_RADIX_ZERO_PAD
     /* For hexadecimal output, add zero padding when number of digits is odd */
     if ((digs & 1) && (radix == 16)) {
         *str++ = fp_s_rmap[0];