diff --git a/tests/api.c b/tests/api.c
index 6d064c537..140a59984 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -22059,7 +22059,7 @@ static int test_wc_Ed448PrivateKeyToDer (void)
 static int test_wc_SetSubjectBuffer (void)
 {
     int ret = 0;
-#if defined(WOLFSSL_CERT_GEN)
+#if defined(WOLFSSL_CERT_GEN) && !defined(NO_RSA)
     Cert    cert;
     FILE*   file;
     byte*   der;
diff --git a/testsuite/testsuite.c b/testsuite/testsuite.c
index 039ef9f72..d54b0eb77 100644
--- a/testsuite/testsuite.c
+++ b/testsuite/testsuite.c
@@ -80,6 +80,11 @@ char* myoptarg = NULL;
 #ifdef HAVE_STACK_SIZE
 static void *echoclient_test_wrapper(void* args) {
     echoclient_test(args);
+
+#if defined(HAVE_ECC) && defined(FP_ECC) && defined(HAVE_THREAD_LS)
+    wc_ecc_fp_free();  /* free per thread cache */
+#endif
+
     return (void *)0;
 }
 #endif
diff --git a/wolfcrypt/src/cpuid.c b/wolfcrypt/src/cpuid.c
index 09b265122..22dc8fdd7 100644
--- a/wolfcrypt/src/cpuid.c
+++ b/wolfcrypt/src/cpuid.c
@@ -29,7 +29,8 @@
 #include <wolfssl/wolfcrypt/cpuid.h>
 
 #if (defined(WOLFSSL_X86_64_BUILD) || defined(USE_INTEL_SPEEDUP) || \
-     defined(WOLFSSL_AESNI)) && !defined(WOLFSSL_NO_ASM)
+     defined(WOLFSSL_AESNI) || defined(WOLFSSL_SP_ASM)) && \
+     !defined(WOLFSSL_NO_ASM)
     /* Each platform needs to query info type 1 from cpuid to see if aesni is
      * supported. Also, let's setup a macro for proper linkage w/o ABI conflicts
      */
diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c
index 5cf19cb9c..0966a4d41 100644
--- a/wolfcrypt/test/test.c
+++ b/wolfcrypt/test/test.c
@@ -13810,11 +13810,11 @@ static int rsa_test(void)
 #endif
 #else
     #ifdef USE_CERT_BUFFERS_2048
-        ret = mp_read_unsigned_bin(key.n, &tmp[12], 256);
+        ret = mp_read_unsigned_bin(&key->n, &tmp[12], 256);
         if (ret != 0) {
             ERROR_OUT(-7705, exit_rsa);
         }
-        ret = mp_set_int(key.e, WC_RSA_EXPONENT);
+        ret = mp_set_int(&key->e, WC_RSA_EXPONENT);
         if (ret != 0) {
             ERROR_OUT(-7706, exit_rsa);
         }
diff --git a/wolfssl/wolfcrypt/cpuid.h b/wolfssl/wolfcrypt/cpuid.h
index c0ca22882..484021bd7 100644
--- a/wolfssl/wolfcrypt/cpuid.h
+++ b/wolfssl/wolfcrypt/cpuid.h
@@ -33,7 +33,7 @@
 #endif
 
 #if defined(WOLFSSL_X86_64_BUILD) || defined(USE_INTEL_SPEEDUP) || \
-    defined(WOLFSSL_AESNI)
+    defined(WOLFSSL_AESNI) || defined(WOLFSSL_SP_ASM)
     #define CPUID_AVX1   0x0001
     #define CPUID_AVX2   0x0002
     #define CPUID_RDRAND 0x0004