diff --git a/tests/api.c b/tests/api.c
index a5cde9759..62be70388 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -19905,8 +19905,8 @@ static void test_wolfSSL_PEM_PrivateKey(void)
 static void test_wolfSSL_PEM_bio_RSAKey(void)
 {
 #if (defined(OPENSSL_EXTRA) || defined(OPENSSL_ALL)) && \
-    defined(WOLFSSL_KEY_GEN) && \
-    !defined(NO_FILESYSTEM) && !defined(NO_RSA) && !defined(NO_CERTS)
+    defined(WOLFSSL_KEY_GEN) && !defined(NO_RSA) && \
+    !defined(HAVE_USER_RSA) && !defined(NO_FILESYSTEM) && !defined(NO_CERTS)
     RSA* rsa = NULL;
     BIO* bio = NULL;
 
diff --git a/wolfssl/wolfcrypt/pkcs7.h b/wolfssl/wolfcrypt/pkcs7.h
index b0b0de2fb..840d94281 100644
--- a/wolfssl/wolfcrypt/pkcs7.h
+++ b/wolfssl/wolfcrypt/pkcs7.h
@@ -154,7 +154,7 @@ enum Pkcs7_Misc {
                             MAX_SEQ_SZ + ASN_NAME_MAX + MAX_SN_SZ +
                             MAX_SEQ_SZ + MAX_ALGO_SZ + 1 + MAX_ENCRYPTED_KEY_SZ,
 #if (defined(HAVE_FIPS) && defined(HAVE_FIPS_VERSION) && \
-     (HAVE_FIPS_VERSION >= 2))
+     (HAVE_FIPS_VERSION >= 2)) || defined(HAVE_SELFTEST)
     /* In the event of fips cert 3389 or CAVP selftest build, these enums are
      * not in aes.h for use with pkcs7 so enumerate it here outside the fips
      * boundary */