diff --git a/wolfcrypt/src/dh.c b/wolfcrypt/src/dh.c
index a0da997b2..5756db6e1 100755
--- a/wolfcrypt/src/dh.c
+++ b/wolfcrypt/src/dh.c
@@ -701,7 +701,9 @@ static int wc_DhGenerateKeyPair_Async(DhKey* key, WC_RNG* rng,
 #endif
 
     /* otherwise use software DH */
-    return wc_DhGenerateKeyPair_Sync(key, rng, priv, privSz, pub, pubSz);
+    ret = wc_DhGenerateKeyPair_Sync(key, rng, priv, privSz, pub, pubSz);
+
+    return ret;
 }
 #endif /* WOLFSSL_ASYNC_CRYPT && WC_ASYNC_ENABLE_DH */
 
diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c
index 26b885de5..2792969e4 100644
--- a/wolfcrypt/test/test.c
+++ b/wolfcrypt/test/test.c
@@ -9174,6 +9174,7 @@ int scrypt_test(void)
         0xc7, 0x27, 0xaf, 0xb9, 0x4a, 0x83, 0xee, 0x6d,
         0x83, 0x60, 0xcb, 0xdf, 0xa2, 0xcc, 0x06, 0x40
     };
+#if !defined(BENCH_EMBEDDED) && !defined(HAVE_INTEL_QA)
     const byte verify3[] = {
         0x70, 0x23, 0xbd, 0xcb, 0x3a, 0xfd, 0x73, 0x48,
         0x46, 0x1c, 0x06, 0xcd, 0x81, 0xfd, 0x38, 0xeb,
@@ -9184,6 +9185,7 @@ int scrypt_test(void)
         0xe6, 0x1e, 0x85, 0xdc, 0x0d, 0x65, 0x1e, 0x40,
         0xdf, 0xcf, 0x01, 0x7b, 0x45, 0x57, 0x58, 0x87
     };
+#endif
 #ifdef SCRYPT_TEST_ALL
     /* Test case is very slow.
      * Use for confirmation after code change or new platform.
@@ -9214,7 +9216,7 @@ int scrypt_test(void)
         return -6003;
 
     /* Don't run these test on embedded, since they use large mallocs */
-#ifndef BENCH_EMBEDDED
+#if !defined(BENCH_EMBEDDED) && !defined(HAVE_INTEL_QA)
     ret = wc_scrypt(derived, (byte*)"pleaseletmein", 13,
                     (byte*)"SodiumChloride", 14, 14, 8, 1, sizeof(verify3));
     if (ret != 0)
@@ -9230,7 +9232,7 @@ int scrypt_test(void)
     if (XMEMCMP(derived, verify4, sizeof(verify4)) != 0)
         return -6007;
 #endif
-#endif /* !BENCH_EMBEDDED */
+#endif /* !BENCH_EMBEDDED && !HAVE_INTEL_QA */
 
     return 0;
 }