diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c
index fa977140b..90572d6ec 100644
--- a/wolfcrypt/test/test.c
+++ b/wolfcrypt/test/test.c
@@ -5299,9 +5299,6 @@ byte GetEntropy(ENTROPY_CMD cmd, byte* out)
         #ifdef WOLFSSL_CERT_GEN
             static const char* caKeyFile  = CERT_ROOT "ca-key.der";
             static const char* caCertFile = CERT_ROOT "ca-cert.pem";
-            #ifdef HAVE_ECC
-                static const char* eccCaKeyFile  = CERT_ROOT   "ecc-key.der";
-            #endif
         #endif
     #endif /* !NO_RSA */
     #ifndef NO_DH
@@ -5313,8 +5310,10 @@ byte GetEntropy(ENTROPY_CMD cmd, byte* out)
 #endif /* !USE_CERT_BUFFER_* */
 #if !defined(USE_CERT_BUFFERS_256) && !defined(NO_ASN)
     #ifdef HAVE_ECC
-        #ifdef WOLFSSL_CERT_GEN
+        /* cert files to be used in rsa cert gen test, check if RSA enabled */
+        #if defined(WOLFSSL_CERT_GEN) && !defined(NO_RSA)
             static const char* eccCaCertFile = CERT_ROOT "server-ecc.pem";
+            static const char* eccCaKeyFile  = CERT_ROOT   "ecc-key.der";
         #endif
         #ifdef WOLFSSL_CERT_EXT
             static const char* eccCaKeyPubFile  = CERT_ROOT "ecc-keyPub.der";
@@ -5322,9 +5321,9 @@ byte GetEntropy(ENTROPY_CMD cmd, byte* out)
     #endif /* HAVE_ECC */
 #endif /* !USE_CERT_BUFFER_* */
 
-/* Temporary Cert Files */
 #ifdef HAVE_ECC
-    #ifdef WOLFSSL_CERT_GEN
+    /* Temporary Cert Files to be used in rsa cert gen test, is RSA enabled */
+    #if defined(WOLFSSL_CERT_GEN) && !defined(NO_RSA)
         static const char* certEccPemFile = CERT_PREFIX "certecc.pem";
     #endif
     #ifdef WOLFSSL_KEY_GEN
@@ -5332,9 +5331,11 @@ byte GetEntropy(ENTROPY_CMD cmd, byte* out)
         static const char* eccPubKeyDerFile = CERT_PREFIX "ecc-public-key.der";
         static const char* eccCaKeyTempFile = CERT_PREFIX "ecc-key.der";
     #endif
-    #if defined(WOLFSSL_CERT_GEN) || \
+    #ifndef NO_RSA
+      #if defined(WOLFSSL_CERT_GEN) || \
             (defined(WOLFSSL_CERT_EXT) && defined(WOLFSSL_TEST_CERT))
         static const char* certEccDerFile = CERT_PREFIX "certecc.der";
+      #endif
     #endif
 #endif /* HAVE_ECC */