diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
index 6cbcc8f8ce..4080b1528c 100644
--- a/.github/workflows/python.yml
+++ b/.github/workflows/python.yml
@@ -136,21 +136,7 @@ jobs:
         working-directory: cpython
         run: |
           export LD_LIBRARY_PATH=$GITHUB_WORKSPACE/build-dir/lib:$LD_LIBRARY_PATH
-          rm aclocal.m4
+          rm -f aclocal.m4
           autoreconf -if
           ./configure --with-wolfssl=$GITHUB_WORKSPACE/build-dir
-          make -j test TESTOPTS="-v \
-            test_ssl \
-            test.test_asyncio.test_ssl \
-            test.test_asyncio.test_sslproto \
-            test_hashlib \
-            test_hmac \
-            test_secrets \
-            test_ftplib \
-            test_imaplib \
-            test_poplib \
-            test_smtplib \
-            test_httplib \
-            test_urllib2_localnet \
-            test_xmlrpc \
-            test_docxmlrpc"
+          make -j test TESTOPTS="-v ${{ matrix.tests }}"
diff --git a/src/ssl.c b/src/ssl.c
index 9f8468cadf..cb05491a2b 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -14032,7 +14032,12 @@ void* wolfSSL_GetHKDFExtractCtx(WOLFSSL* ssl)
         }
         if (i == (int)WOLFSSL_OBJECT_INFO_SZ) {
             WOLFSSL_MSG("NID not in table");
+        #ifdef WOLFSSL_QT
+            sName = NULL;
+            type = (word32)id;
+        #else
             return NULL;
+        #endif
         }
 
     #ifdef HAVE_ECC
diff --git a/wolfcrypt/src/evp.c b/wolfcrypt/src/evp.c
index b0c6811073..3bfc7345e0 100644
--- a/wolfcrypt/src/evp.c
+++ b/wolfcrypt/src/evp.c
@@ -5818,16 +5818,18 @@ void wolfSSL_EVP_init(void)
                 case WC_HASH_TYPE_MD5_SHA:
                 case WC_HASH_TYPE_BLAKE2B:
                 case WC_HASH_TYPE_BLAKE2S:
+                    ret = BAD_FUNC_ARG;
+                    break;
             #if defined(WOLFSSL_SHA3) && defined(WOLFSSL_SHAKE128)
                 case WC_HASH_TYPE_SHAKE128:
                     ret = wc_Shake128_Copy((wc_Shake*)&src->hash.digest.shake,
-                            (wc_Sha3*)&des->hash.digest.shake);
+                            (wc_Shake*)&des->hash.digest.shake);
                     break;
             #endif
             #if defined(WOLFSSL_SHA3) && defined(WOLFSSL_SHAKE256)
                 case WC_HASH_TYPE_SHAKE256:
                     ret = wc_Shake256_Copy((wc_Shake*)&src->hash.digest.shake,
-                            (wc_Sha3*)&des->hash.digest.shake);
+                            (wc_Shake*)&des->hash.digest.shake);
                     break;
             #endif
                 default:
diff --git a/wolfssl/openssl/evp.h b/wolfssl/openssl/evp.h
index caf2b70f21..f4ee44cd00 100644
--- a/wolfssl/openssl/evp.h
+++ b/wolfssl/openssl/evp.h
@@ -61,10 +61,7 @@
 #ifdef WOLFSSL_SM3
     #include <wolfssl/wolfcrypt/sm3.h>
 #endif
-#ifdef HAVE_BLAKE2
-    #include <wolfssl/wolfcrypt/blake2.h>
-#endif
-#ifdef HAVE_BLAKE2S
+#if defined(HAVE_BLAKE2) || defined(HAVE_BLAKE2S)
     #include <wolfssl/wolfcrypt/blake2.h>
 #endif
 #ifdef WOLFSSL_SM4