diff --git a/src/ssl.c b/src/ssl.c
index 1dfa13b8e..089325ff8 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -43393,8 +43393,8 @@ WOLFSSL_EVP_PKEY* wolfSSL_d2i_AutoPrivateKey(WOLFSSL_EVP_PKEY** pkey,
 }
 #endif
 
-#if defined(OPENSSL_EXTRA) && !defined(NO_CERTS) && defined(WOLFSSL_CERT_GEN) && \
-    defined(WOLFSSL_CERT_REQ)
+#if defined(OPENSSL_EXTRA) && !defined(NO_CERTS) && \
+    defined(WOLFSSL_CERT_GEN) && defined(WOLFSSL_CERT_REQ)
 int wolfSSL_X509_set_subject_name(WOLFSSL_X509 *cert, WOLFSSL_X509_NAME *name)
 {
     int i;
diff --git a/tests/api.c b/tests/api.c
index 7b3dd9922..0782296dd 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -22664,7 +22664,8 @@ static void test_wolfSSL_X509_NAME_ENTRY(void)
 
 static void test_wolfSSL_X509_set_name(void)
 {
-#if defined(OPENSSL_ALL) && !defined(NO_CERTS)
+#if defined(OPENSSL_EXTRA) && !defined(NO_CERTS) && \
+    defined(WOLFSSL_CERT_GEN) && defined(WOLFSSL_CERT_REQ)
     X509* x509;
     X509_NAME* name;
 
@@ -27747,8 +27748,8 @@ static void test_wolfSSL_RSA_verify()
 }
 
 
-#if defined(OPENSSL_EXTRA) && (defined(HAVE_ECC) || !defined(NO_RSA)) && \
-    !defined(NO_CERTS) && defined(WOLFSSL_CERT_GEN) && defined(WOLFSSL_CERT_REQ)
+#if defined(OPENSSL_EXTRA) && !defined(NO_CERTS) && \
+    defined(WOLFSSL_CERT_GEN) && defined(WOLFSSL_CERT_REQ)
 static void test_openssl_make_self_signed_certificate(EVP_PKEY* pkey)
 {
     X509* x509 = NULL;