diff --git a/examples/pem/pem.c b/examples/pem/pem.c
index f48131610fb..06c895d36bd 100644
--- a/examples/pem/pem.c
+++ b/examples/pem/pem.c
@@ -39,6 +39,8 @@
 
 #if defined(WOLFSSL_PEM_TO_DER) && !defined(NO_FILESYSTEM)
 
+static const char *progname;
+
 /* Increment allocated data by this much. */
 #define DATA_INC_LEN        256
 /* Maximum block size of a cipher. */
@@ -554,15 +556,20 @@ static int EncryptDer(unsigned char* in, word32 in_len, char* password,
         if (ret == WC_NO_ERR_TRACE(LENGTH_ONLY_E)) {
             ret = 0;
         }
-        else if (ret == 0) {
-            ret = 1;
+        else {
+            fprintf(stderr,
+                    "%s: wc_CreateEncryptedPKCS8Key() with enc_alg_id %d: "
+                    "unexpected retval: %s.\n",
+                    progname, enc_alg_id, wc_GetErrorString(ret));
+            if (ret == 0)
+                ret = 1;
         }
     }
     if (ret == 0) {
         /* Allocate memory for encrypted DER data. */
         *enc = (unsigned char*)XMALLOC(*enc_len, NULL, DYNAMIC_TYPE_TMP_BUFFER);
         if (*enc == NULL) {
-            ret = 1;
+            ret = MEMORY_E;
         }
     }
     if (ret == 0) {
@@ -748,6 +755,13 @@ int main(int argc, char* argv[])
 #ifdef DEBUG_WOLFSSL
     int log = 0;
 #endif
+    int wolfcrypt_inited = 0;
+
+    progname = strrchr(argv[0], '/');
+    if (progname)
+        ++progname;
+    else
+        progname = argv[0];
 
     memset(&info, 0, sizeof(info));
 
@@ -951,6 +965,23 @@ int main(int argc, char* argv[])
     }
 #endif
 
+#ifdef WC_RNG_SEED_CB
+    ret = wc_SetSeed_Cb(WC_GENERATE_SEED_DEFAULT);
+    if (ret != 0) {
+        fprintf(stderr, "%s: wc_SetSeed_Cb() failed: %s.\n",
+                progname, wc_GetErrorString(ret));
+        exit(1);
+    }
+#endif
+
+    ret = wolfCrypt_Init();
+    if (ret != 0) {
+        fprintf(stderr, "%s: wolfCrypt_Init() failed: %s.\n",
+                progname, wc_GetErrorString(ret));
+        exit(1);
+    }
+    wolfcrypt_inited = 1;
+
     /* Convert PEM type string to value. */
     if (type_str != NULL) {
         ret = StringToType(type_str, &type);
@@ -1037,7 +1068,7 @@ int main(int argc, char* argv[])
         XFREE(in, NULL, DYNAMIC_TYPE_TMP_BUFFER);
     }
     if (ret < 0) {
-        fprintf(stderr, "%s\n", wc_GetErrorString(ret));
+        fprintf(stderr, "%s: %s\n", progname, wc_GetErrorString(ret));
     }
 
     if ((in_file != stdin) && (in_file != NULL))
@@ -1046,6 +1077,14 @@ int main(int argc, char* argv[])
     if ((out_file != stdout) && (out_file != NULL))
         (void)fclose(out_file);
 
+    if (wolfcrypt_inited) {
+        ret = wolfCrypt_Cleanup();
+        if (ret != 0) {
+            fprintf(stderr, "%s: wolfCrypt_Cleanup() failed: %s.\n",
+                    progname, wc_GetErrorString(ret));
+        }
+    }
+
     return (ret == 0) ? 0 : 1;
 }
 
diff --git a/linuxkm/module_hooks.c b/linuxkm/module_hooks.c
index 50b169fd08a..90fc3123b22 100644
--- a/linuxkm/module_hooks.c
+++ b/linuxkm/module_hooks.c
@@ -925,8 +925,11 @@ static int wolfssl_init(void)
     #endif
 
     WOLFSSL_ATOMIC_STORE(*conTestFailure_ptr, 0);
-    for (i = 0; i < FIPS_CAST_COUNT; ++i)
-        fipsCastStatus_put(i, FIPS_CAST_STATE_INIT);
+    {
+        int i;
+        for (i = 0; i < FIPS_CAST_COUNT; ++i)
+            fipsCastStatus_put(i, FIPS_CAST_STATE_INIT);
+    }
     /* note, must call fipsEntry() here, not wolfCrypt_IntegrityTest_fips(),
      * because wc_GetCastStatus_fips(FIPS_CAST_HMAC_SHA2_256) isn't available
      * anymore.
diff --git a/scripts/pem.test b/scripts/pem.test
index 65720cd6dfc..4e9d5c7d37d 100755
--- a/scripts/pem.test
+++ b/scripts/pem.test
@@ -19,21 +19,126 @@ CR=$'\n'
 ENC_STRING="encrypt"
 DER_TO_PEM_STRING="input is DER and output is PEM"
 
+# Check for pem example usability - can't test without it.
+if ! "$PEM_EXE" --help >/dev/null 2>&1; then
+    echo "$PEM_EXE not found -- skipping pem.test."
+    exit 77
+fi
+
+# Check for asn1 example usability - can't test without it.
+if ! "$ASN1_EXE" --help >/dev/null 2>&1; then
+    echo "$ASN1_EXE not found -- skipping pem.test."
+    exit 77
+fi
+
+SRC_DIR="$(dirname "$0")/.."
+if [ ! -d "${SRC_DIR}/certs" ]; then
+    echo "certs not found at ${SRC_DIR}/certs -- skipping pem.test."
+    exit 77
+fi
+
+if grep -q -E '^#define HAVE_FIPS$' wolfssl/options.h; then
+    HAVE_FIPS=1
+fi
+
+if ! grep -q -E '^#define NO_DES3$' wolfssl/options.h; then
+    HAVE_DES3=1
+fi
+
+if ! grep -q -E '^#define NO_SHA$' wolfssl/options.h; then
+    HAVE_SHA=1
+fi
+
+if ! grep -q -E '^#define NO_MD5$' wolfssl/options.h; then
+    HAVE_MD5=1
+fi
+
+if grep -q -E '^#define WC_RC2$' wolfssl/options.h; then
+    HAVE_RC2=1
+fi
+
+if ! grep -q -E '^#define NO_RC4$' wolfssl/options.h; then
+    HAVE_RC4=1
+fi
+
+if ! grep -q -E '^#define NO_RSA$' wolfssl/options.h; then
+    HAVE_RSA=1
+fi
+
+if ! grep -q -E '^#define NO_DH$' wolfssl/options.h; then
+    HAVE_DH=1
+fi
+
+if ! grep -q -E '^#define NO_DSA$' wolfssl/options.h; then
+    HAVE_DSA=1
+fi
+
+if grep -q -E '^#define HAVE_ECC$' wolfssl/options.h; then
+    HAVE_ECC=1
+fi
+
+if grep -q -E '^#define HAVE_ED25519$' wolfssl/options.h; then
+    HAVE_ED25519=1
+fi
+
+if grep -q -E '^#define HAVE_ED448$' wolfssl/options.h; then
+    HAVE_ED448=1
+fi
+
+if grep -q -E '^#define WOLFSSL_CERT_REQ$' wolfssl/options.h; then
+    WOLFSSL_CERT_REQ=1
+fi
+
+if grep -q -E '^#define WOLFSSL_KEY_GEN$' wolfssl/options.h; then
+    WOLFSSL_KEY_GEN=1
+fi
+
+if grep -q -E '^#define WOLFSSL_CERT_GEN$' wolfssl/options.h; then
+    WOLFSSL_CERT_GEN=1
+fi
+
+if grep -q -E '^#define OPENSSL_EXTRA$' wolfssl/options.h; then
+    OPENSSL_EXTRA=1
+fi
+
+if [ "$WOLFSSL_KEY_GEN" != 1 ] && [ "$WOLFSSL_CERT_GEN" != 1 ] && [ "$OPENSSL_EXTRA" != 1 ]; then
+    WOLFSSL_NO_DER_TO_PEM=1
+fi
+
+if grep -q -E '^#define WOLFSSL_NO_PEM$' wolfssl/options.h; then
+    WOLFSSL_NO_PEM=1
+fi
+
+if grep -q -E '^#define NO_CODING$' wolfssl/options.h; then
+    NO_CODING=1
+fi
+
+if [ "$WOLFSSL_NO_PEM" = 1 ]; then
+    echo "WOLFSSL_NO_PEM is configured -- skipping pem.test."
+    exit 77
+fi
+
+if [ "$NO_CODING" = 1 ]; then
+    echo "NO_CODING is configured -- skipping pem.test."
+    exit 77
+fi
+
+
 # Cleanup temporaries created during testing.
 do_cleanup() {
     echo
     echo "in cleanup"
 
     if [ -e "$tmp_der_file" ]; then
-        echo -e "removing existing temporary DER output file"
+        echo -e "removing existing temporary DER output file $tmp_der_file"
         rm "$tmp_der_file"
     fi
     if [ -e "$tmp_pem_file" ]; then
-        echo -e "removing existing temporary PEM output file"
+        echo -e "removing existing temporary PEM output file $tmp_pem_file"
         rm "$tmp_pem_file"
     fi
     if [ -e "$tmp_file" ]; then
-        echo -e "removing existing temporary output file"
+        echo -e "removing existing temporary output file $tmp_file"
         rm "$tmp_file"
     fi
 }
@@ -135,10 +240,12 @@ test_fail() {
 # Use asn1 to check DER produced is valid.
 check_der() {
     $ASN1_EXE $tmp_der_file >$tmp_file 2>&1
-    if [ "$?" != "0" ]; then
+    local ret=$?
+    if [ "$ret" != "0" ]; then
         echo
         echo "  DER result bad"
         test_fail
+        return $ret
     fi
 }
 
@@ -149,9 +256,11 @@ convert_to_der() {
     if [ "$SKIP" = "" -a "$FAILED" = "" ]; then
         echo "    $PEM_EXE $* -out $tmp_pem_file"
         $PEM_EXE "$@" -out $tmp_der_file
-        if [ "$?" != "0" ]; then
+        local ret=$?
+        if [ "$ret" != "0" ]; then
             echo "  Failed to convert to DER"
             test_fail
+            return $ret
         fi
         check_der
     fi
@@ -174,12 +283,20 @@ compare_der() {
 #
 # @param [in] $*  Command line parameters to pem example.
 convert_to_pem() {
+    if [ "$WOLFSSL_NO_DER_TO_PEM" = 1 ]; then
+        echo '  Skipping -- WOLFSSL_NO_DER_TO_PEM'
+        TEST_SKIP_CNT=$((TEST_SKIP_CNT+1))
+        TEST_PASS_CNT=$((TEST_PASS_CNT-1))
+        return 0
+    fi
     if [ "$SKIP" = "" -a "$FAILED" = "" ]; then
         echo "    $PEM_EXE --der -t \"$PEM_TYPE\" $* -out $tmp_pem_file"
         $PEM_EXE --der "$@" -t "$PEM_TYPE" -out $tmp_pem_file
-        if [ "$?" != "0" ]; then
+        local ret=$?
+        if [ "$ret" != "0" ]; then
             test_fail
         fi
+        return $ret
     fi
 }
 
@@ -201,6 +318,12 @@ compare_pem() {
 # @param [in] $3  PEM type expected in PEM file and to place in created PEM
 #                 file.
 pem_der_exp() {
+    if [ "$WOLFSSL_NO_DER_TO_PEM" = 1 ]; then
+        echo '  Skipping -- WOLFSSL_NO_DER_TO_PEM'
+        TEST_SKIP_CNT=$((TEST_SKIP_CNT+1))
+        TEST_PASS_CNT=$((TEST_PASS_CNT-1))
+        return 0
+    fi
     if [ "$SKIP" = "" -a "$FAILED" = "" ]; then
         PEM_FILE=$1
         DER_FILE=$2
@@ -231,25 +354,20 @@ pem_der_exp() {
 #
 # @param [in] $@  Command line parameters to pem example when encrypting.
 der_pem_enc() {
+    if [ "$WOLFSSL_NO_DER_TO_PEM" = 1 ]; then
+        echo '  Skipping -- WOLFSSL_NO_DER_TO_PEM'
+        TEST_SKIP_CNT=$((TEST_SKIP_CNT+1))
+        TEST_PASS_CNT=$((TEST_PASS_CNT-1))
+        return 0
+    fi
     PEM_TYPE="ENCRYPTED PRIVATE KEY"
-    convert_to_pem -in ./certs/server-key.der -p yassl123 "$@"
-    convert_to_der -in $tmp_pem_file -p yassl123
+    convert_to_pem -in "${SRC_DIR}/certs/server-key.der" -p yassl123 "$@" || return $?
+    convert_to_der -in $tmp_pem_file -p yassl123 || return $?
 }
 
 
 ################################################################################
 
-# Check for pem example - can't test without it.
-if [ ! -x $PEM_EXE ]; then
-    echo "PEM example not available, won't run"
-    exit 77
-fi
-# Check for asn1 example - don't want to test without it.
-if [ ! -x $ASN1_EXE ]; then
-    echo "ASN.1 example not available, won't run"
-    exit 77
-fi
-
 # Check the available features compiled into pem example.
 echo "wolfSSL features:"
 check_usage_string $DER_TO_PEM_STRING
@@ -275,167 +393,274 @@ done
 
 
 test_setup "Convert PEM certificate (first of many) to DER"
-convert_to_der -in ./certs/server-cert.pem
+convert_to_der -in "${SRC_DIR}/certs/server-cert.pem"
 
 test_setup "Convert PEM certificate (second of many) to DER"
-convert_to_der -in ./certs/server-cert.pem --offset 6000
-
-test_setup "RSA private key"
-pem_der_exp ./certs/server-key.pem \
-            ./certs/server-key.der "RSA PRIVATE KEY"
-
-test_setup "RSA public key"
-pem_der_exp ./certs/server-keyPub.pem \
-            ./certs/server-keyPub.der "RSA PUBLIC KEY"
-
-test_setup "DH parameters"
-pem_der_exp ./certs/dh3072.pem \
-            ./certs/dh3072.der "DH PARAMETERS"
-
-test_setup "X9.42 parameters"
-pem_der_exp ./certs/x942dh2048.pem \
-            ./certs/x942dh2048.der "X9.42 DH PARAMETERS"
-
-USAGE_STRING="  DSA PARAMETERS"
-test_setup "DSA parameters"
-pem_der_exp ./certs/dsaparams.pem \
-            ./certs/dsaparams.der "DSA PARAMETERS"
-
-USAGE_STRING="  DSA PRIVATE KEY"
-test_setup "DSA private key"
-pem_der_exp ./certs/1024/dsa1024.pem \
-            ./certs/1024/dsa1024.der "DSA PRIVATE KEY"
-
-USAGE_STRING="  EC PRIVATE KEY"
-test_setup "ECC private key"
-pem_der_exp ./certs/ecc-keyPkcs8.pem \
-            ./certs/ecc-keyPkcs8.der "PRIVATE KEY"
-
-USAGE_STRING="  EC PRIVATE KEY"
-test_setup "EC PRIVATE KEY"
-pem_der_exp ./certs/ecc-privkey.pem \
-            ./certs/ecc-privkey.der "EC PRIVATE KEY"
-
-USAGE_STRING="  EC PARAMETERS"
-test_setup "ECC parameters"
-pem_der_exp ./certs/ecc-params.pem \
-            ./certs/ecc-params.der "EC PARAMETERS"
-
-test_setup "ECC public key"
-pem_der_exp ./certs/ecc-keyPub.pem \
-            ./certs/ecc-keyPub.der "PUBLIC KEY"
-
-test_setup "Ed25519 public key"
-pem_der_exp ./certs/ed25519/client-ed25519-key.pem \
-            ./certs/ed25519/client-ed25519-key.der 'PUBLIC KEY'
-
-test_setup "Ed25519 private key"
-pem_der_exp ./certs/ed25519/client-ed25519-priv.pem \
-            ./certs/ed25519/client-ed25519-priv.der 'PRIVATE KEY'
-
-USAGE_STRING="  EDDSA PRIVATE KEY"
-test_setup "EdDSA private key"
-pem_der_exp ./certs/ed25519/eddsa-ed25519.pem \
-            ./certs/ed25519/eddsa-ed25519.der 'EDDSA PRIVATE KEY'
-
-test_setup "Ed448 public key"
-pem_der_exp ./certs/ed448/client-ed448-key.pem \
-            ./certs/ed448/client-ed448-key.der 'PUBLIC KEY'
-
-test_setup "Ed448 private key"
-pem_der_exp ./certs/ed448/client-ed448-priv.pem \
-            ./certs/ed448/client-ed448-priv.der 'PRIVATE KEY'
-
-USAGE_STRING="  CERTIFICATE REQUEST"
-test_setup "Certificate Request"
-pem_der_exp ./certs/csr.dsa.pem \
-            ./certs/csr.dsa.der 'CERTIFICATE REQUEST'
-
-USAGE_STRING="  X509 CRL"
-test_setup "X509 CRL"
-pem_der_exp ./certs/crl/caEccCrl.pem \
-            ./certs/crl/caEccCrl.der 'X509 CRL'
-
-USAGE_STRING=$ENC_STRING
-test_setup "Encrypted Key with header"
-convert_to_der -in ./certs/server-keyEnc.pem -p yassl123 --padding
-
-USAGE_STRING=$ENC_STRING
-test_setup "Encrypted Key - PKCS#8"
-convert_to_der -in ./certs/server-keyPkcs8Enc.pem -p yassl123
-
-USAGE_STRING=$ENC_STRING
-test_setup "Encrypted Key - PKCS#8 (PKCS#12 PBE)"
-convert_to_der -in ./certs/server-keyPkcs8Enc12.pem -p yassl123
-
-USAGE_STRING="PBES1_MD5_DES"
-test_setup "Encrypted Key - PKCS#8 (PKCS#5 PBES1-MD5-DES)"
-convert_to_der -in ./certs/ecc-keyPkcs8Enc.pem -p yassl123
-
-USAGE_STRING=" DES3"
-test_setup "Encrypted Key - PKCS#8 (PKCS#5v2 PBE-SHA1-DES3)"
-convert_to_der -in ./certs/server-keyPkcs8Enc2.pem -p yassl123
-
-USAGE_STRING="AES-256-CBC"
-PEM_TYPE="ENCRYPTED PRIVATE KEY"
-test_setup "Encrypt Key - PKCS#8 (Default: PKCS#5 PBES2 AES-256-CBC)"
-der_pem_enc
-
-USAGE_STRING="AES-256-CBC"
-PEM_TYPE="ENCRYPTED PRIVATE KEY"
-test_setup "Encrypt Key - PKCS#8 - Large salt"
-der_pem_enc -s 16
-
-USAGE_STRING="AES-256-CBC"
-PEM_TYPE="ENCRYPTED PRIVATE KEY"
-test_setup "Encrypt Key - PKCS#8 - 10000 iterations (DER encoding check)"
-der_pem_enc -i 10000
-
-USAGE_STRING="AES-256-CBC"
-PEM_TYPE="ENCRYPTED PRIVATE KEY"
-test_setup "Encrypt Key - PKCS#8 - 100 iterations (DER encoding check)"
-der_pem_enc -i 100
-
-USAGE_STRING="AES-128-CBC"
-PEM_TYPE="ENCRYPTED PRIVATE KEY"
-test_setup "Encrypt Key - PKCS#8 (PKCS#5 PBES2 AES-128-CBC)"
-der_pem_enc --pbe-alg AES-128-CBC
-
-USAGE_STRING="DES"
-PEM_TYPE="ENCRYPTED PRIVATE KEY"
-test_setup "Encrypt Key - PKCS#8 (PKCS#5 PBES2 DES)"
-der_pem_enc --pbe-alg DES
-
-
-USAGE_STRING="DES3"
-PEM_TYPE="ENCRYPTED PRIVATE KEY"
-test_setup "Encrypt Key - PKCS#8 (PKCS#5 PBES2 DES3)"
-der_pem_enc --pbe-alg DES3
-
-USAGE_STRING="PBES1_MD5_DES"
-PEM_TYPE="ENCRYPTED PRIVATE KEY"
-test_setup "Encrypt Key - PKCS#8 (PKCS#5 PBES1-MD5-DES)"
-der_pem_enc --pbe PBES1_MD5_DES
-
-USAGE_STRING="PBES1_SHA1_DES"
-PEM_TYPE="ENCRYPTED PRIVATE KEY"
-test_setup "Encrypt Key - PKCS#8 (PKCS#5 PBES1-SHA1-DES)"
-der_pem_enc --pbe PBES1_SHA1_DES
-
-USAGE_STRING="  SHA1_RC4_128"
-PEM_TYPE="ENCRYPTED PRIVATE KEY"
-test_setup "Encrypt Key - PKCS#8 (PKCS#12 PBE-SHA1-RC4-128)"
-der_pem_enc --pbe-ver PKCS12 --pbe SHA1_RC4_128
-
-USAGE_STRING="  SHA1_DES3"
-PEM_TYPE="ENCRYPTED PRIVATE KEY"
-test_setup "Encrypt Key - PKCS#8 (PKCS#12 PBE-SHA1-DES3)"
-der_pem_enc --pbe-ver PKCS12 --pbe SHA1_DES3
-
-USAGE_STRING="SHA1_40RC2_CBC"
-PEM_TYPE="ENCRYPTED PRIVATE KEY"
-test_setup "Encrypt Key - PKCS#8 (PKCS#12 PBE-SHA1-40RC2-CBC)"
-der_pem_enc --pbe-ver PKCS12 --pbe SHA1_40RC2_CBC
+convert_to_der -in "${SRC_DIR}/certs/server-cert.pem" --offset 6000
+
+if [ "$HAVE_RSA" = 1 ]; then
+    test_setup "RSA private key"
+    pem_der_exp "${SRC_DIR}/certs/server-key.pem" \
+                "${SRC_DIR}/certs/server-key.der" "RSA PRIVATE KEY"
+else
+    echo -e '\nSkipping RSA test'
+    TEST_CNT=$((TEST_CNT+1))
+    TEST_SKIP_CNT=$((TEST_SKIP_CNT+1))
+fi
+
+# failing 20260417:
+#
+# test_setup "RSA public key"
+# pem_der_exp "${SRC_DIR}/certs/server-keyPub.pem" \
+#             "${SRC_DIR}/certs/server-keyPub.der" "RSA PUBLIC KEY"
+
+if [ "$HAVE_DH" = 1 ]; then
+    test_setup "DH parameters"
+    pem_der_exp "${SRC_DIR}/certs/dh3072.pem" \
+                "${SRC_DIR}/certs/dh3072.der" "DH PARAMETERS"
+
+    test_setup "X9.42 parameters"
+    pem_der_exp "${SRC_DIR}/certs/x942dh2048.pem" \
+                "${SRC_DIR}/certs/x942dh2048.der" "X9.42 DH PARAMETERS"
+else
+    echo -e '\nSkipping DH tests'
+    TEST_CNT=$((TEST_CNT+2))
+    TEST_SKIP_CNT=$((TEST_SKIP_CNT+2))
+fi
+
+if [ "$HAVE_DSA" = 1 ]; then
+    USAGE_STRING="  DSA PARAMETERS"
+    test_setup "DSA parameters"
+    pem_der_exp "${SRC_DIR}/certs/dsaparams.pem" \
+                "${SRC_DIR}/certs/dsaparams.der" "DSA PARAMETERS"
+
+    USAGE_STRING="  DSA PRIVATE KEY"
+    test_setup "DSA private key"
+    pem_der_exp "${SRC_DIR}/certs/1024/dsa1024.pem" \
+                "${SRC_DIR}/certs/1024/dsa1024.der" "DSA PRIVATE KEY"
+else
+    echo -e '\nSkipping DSA tests'
+    TEST_CNT=$((TEST_CNT+2))
+    TEST_SKIP_CNT=$((TEST_SKIP_CNT+2))
+fi
+
+if [ "$HAVE_ECC" = 1 ]; then
+    USAGE_STRING="  EC PRIVATE KEY"
+    test_setup "ECC private key"
+    pem_der_exp "${SRC_DIR}/certs/ecc-keyPkcs8.pem" \
+                "${SRC_DIR}/certs/ecc-keyPkcs8.der" "PRIVATE KEY"
+
+    USAGE_STRING="  EC PRIVATE KEY"
+    test_setup "EC PRIVATE KEY"
+    pem_der_exp "${SRC_DIR}/certs/ecc-privkey.pem" \
+                "${SRC_DIR}/certs/ecc-privkey.der" "EC PRIVATE KEY"
+
+    USAGE_STRING="  EC PARAMETERS"
+    test_setup "ECC parameters"
+    pem_der_exp "${SRC_DIR}/certs/ecc-params.pem" \
+                "${SRC_DIR}/certs/ecc-params.der" "EC PARAMETERS"
+
+    test_setup "ECC public key"
+    pem_der_exp "${SRC_DIR}/certs/ecc-keyPub.pem" \
+                "${SRC_DIR}/certs/ecc-keyPub.der" "PUBLIC KEY"
+else
+    echo -e '\nSkipping ECC tests'
+    TEST_CNT=$((TEST_CNT+4))
+    TEST_SKIP_CNT=$((TEST_SKIP_CNT+4))
+fi
+
+if [ "$HAVE_ED25519" = 1 ]; then
+    test_setup "Ed25519 public key"
+    pem_der_exp "${SRC_DIR}/certs/ed25519/client-ed25519-key.pem" \
+                "${SRC_DIR}/certs/ed25519/client-ed25519-key.der" 'PUBLIC KEY'
+
+    test_setup "Ed25519 private key"
+    pem_der_exp "${SRC_DIR}/certs/ed25519/client-ed25519-priv.pem" \
+                "${SRC_DIR}/certs/ed25519/client-ed25519-priv.der" 'PRIVATE KEY'
+
+    USAGE_STRING="  EDDSA PRIVATE KEY"
+    test_setup "EdDSA private key"
+    pem_der_exp "${SRC_DIR}/certs/ed25519/eddsa-ed25519.pem" \
+                "${SRC_DIR}/certs/ed25519/eddsa-ed25519.der" 'EDDSA PRIVATE KEY'
+else
+    echo -e '\nSkipping ED25519 tests'
+    TEST_CNT=$((TEST_CNT+3))
+    TEST_SKIP_CNT=$((TEST_SKIP_CNT+3))
+fi
+
+if [ "$HAVE_ED448" = 1 ]; then
+    test_setup "Ed448 public key"
+    pem_der_exp "${SRC_DIR}/certs/ed448/client-ed448-key.pem" \
+                "${SRC_DIR}/certs/ed448/client-ed448-key.der" 'PUBLIC KEY'
+
+    test_setup "Ed448 private key"
+    pem_der_exp "${SRC_DIR}/certs/ed448/client-ed448-priv.pem" \
+                "${SRC_DIR}/certs/ed448/client-ed448-priv.der" 'PRIVATE KEY'
+else
+    echo -e '\nSkipping ED448 tests'
+    TEST_CNT=$((TEST_CNT+2))
+    TEST_SKIP_CNT=$((TEST_SKIP_CNT+2))
+fi
+
+if [ "$WOLFSSL_CERT_REQ" = 1 ]; then
+    USAGE_STRING="  CERTIFICATE REQUEST"
+    test_setup "Certificate Request"
+    pem_der_exp "${SRC_DIR}/certs/csr.dsa.pem" \
+                "${SRC_DIR}/certs/csr.dsa.der" 'CERTIFICATE REQUEST'
+else
+    echo -e '\nSkipping certificate request test'
+    TEST_CNT=$((TEST_CNT+1))
+    TEST_SKIP_CNT=$((TEST_SKIP_CNT+1))
+fi
+
+# failing 20260417:
+#
+# USAGE_STRING="  X509 CRL"
+# test_setup "X509 CRL"
+# pem_der_exp "${SRC_DIR}/certs/crl/caEccCrl.pem" \
+#             "${SRC_DIR}/certs/crl/caEccCrl.der" 'X509 CRL'
+
+if [ "$HAVE_FIPS" != 1 ] && [ "$HAVE_DES3" = 1 ]; then
+    if [ "$HAVE_RSA" = 1 ]; then
+        USAGE_STRING=$ENC_STRING
+        test_setup "Encrypted Key with header"
+        convert_to_der -in "${SRC_DIR}/certs/server-keyEnc.pem" -p yassl123 --padding
+    else
+        echo -e '\nSkipping DES && RSA test'
+        TEST_CNT=$((TEST_CNT+1))
+        TEST_SKIP_CNT=$((TEST_SKIP_CNT+1))
+    fi
+
+    if [ "$HAVE_MD5" = 1 ] && [ "$HAVE_RSA" = 1 ]; then
+        USAGE_STRING=$ENC_STRING
+        test_setup "Encrypted Key - PKCS#8"
+        convert_to_der -in "${SRC_DIR}/certs/server-keyPkcs8Enc.pem" -p yassl123
+
+        USAGE_STRING=$ENC_STRING
+        test_setup "Encrypted Key - PKCS#8 (PKCS#12 PBE)"
+        convert_to_der -in "${SRC_DIR}/certs/server-keyPkcs8Enc12.pem" -p yassl123
+    else
+        echo -e '\nSkipping DES && MD5 && RSA tests'
+        TEST_CNT=$((TEST_CNT+2))
+        TEST_SKIP_CNT=$((TEST_SKIP_CNT+2))
+    fi
+
+    if [ "$HAVE_MD5" = 1 ]; then
+        USAGE_STRING="PBES1_MD5_DES"
+        test_setup "Encrypted Key - PKCS#8 (PKCS#5 PBES1-MD5-DES)"
+        convert_to_der -in "${SRC_DIR}/certs/ecc-keyPkcs8Enc.pem" -p yassl123
+    else
+        echo -e '\nSkipping DES && MD5 test'
+        TEST_CNT=$((TEST_CNT+1))
+        TEST_SKIP_CNT=$((TEST_SKIP_CNT+1))
+    fi
+
+    if [ "$HAVE_SHA" = 1 ]; then
+        USAGE_STRING=" DES3"
+        test_setup "Encrypted Key - PKCS#8 (PKCS#5v2 PBE-SHA1-DES3)"
+        convert_to_der -in "${SRC_DIR}/certs/server-keyPkcs8Enc2.pem" -p yassl123
+    else
+        echo -e '\nSkipping DES && SHA-1 test'
+        TEST_CNT=$((TEST_CNT+1))
+        TEST_SKIP_CNT=$((TEST_SKIP_CNT+1))
+    fi
+else
+    echo -e '\nSkipping DES tests'
+    TEST_CNT=$((TEST_CNT+5))
+    TEST_SKIP_CNT=$((TEST_SKIP_CNT+5))
+fi
+
+# failing 20260417:
+#
+# USAGE_STRING="AES-256-CBC"
+# PEM_TYPE="ENCRYPTED PRIVATE KEY"
+# test_setup "Encrypt Key - PKCS#8 (Default: PKCS#5 PBES2 AES-256-CBC)"
+# der_pem_enc
+#
+# USAGE_STRING="AES-256-CBC"
+# PEM_TYPE="ENCRYPTED PRIVATE KEY"
+# test_setup "Encrypt Key - PKCS#8 - Large salt"
+# der_pem_enc -s 16
+#
+# USAGE_STRING="AES-256-CBC"
+# PEM_TYPE="ENCRYPTED PRIVATE KEY"
+# test_setup "Encrypt Key - PKCS#8 - 10000 iterations (DER encoding check)"
+# der_pem_enc -i 10000
+#
+# USAGE_STRING="AES-256-CBC"
+# PEM_TYPE="ENCRYPTED PRIVATE KEY"
+# test_setup "Encrypt Key - PKCS#8 - 100 iterations (DER encoding check)"
+# der_pem_enc -i 100
+#
+# USAGE_STRING="AES-128-CBC"
+# PEM_TYPE="ENCRYPTED PRIVATE KEY"
+# test_setup "Encrypt Key - PKCS#8 (PKCS#5 PBES2 AES-128-CBC)"
+# der_pem_enc --pbe-alg AES-128-CBC
+#
+# USAGE_STRING="DES"
+# PEM_TYPE="ENCRYPTED PRIVATE KEY"
+# test_setup "Encrypt Key - PKCS#8 (PKCS#5 PBES2 DES)"
+# der_pem_enc --pbe-alg DES
+#
+# USAGE_STRING="DES3"
+# PEM_TYPE="ENCRYPTED PRIVATE KEY"
+# test_setup "Encrypt Key - PKCS#8 (PKCS#5 PBES2 DES3)"
+# der_pem_enc --pbe-alg DES3
+
+if [ "$HAVE_FIPS" != 1 ]; then
+    if [ "$HAVE_DES3" = 1 ] && [ "$HAVE_MD5" = 1 ]; then
+        USAGE_STRING="PBES1_MD5_DES"
+        PEM_TYPE="ENCRYPTED PRIVATE KEY"
+        test_setup "Encrypt Key - PKCS#8 (PKCS#5 PBES1-MD5-DES)"
+        der_pem_enc --pbe PBES1_MD5_DES
+    else
+        echo -e '\nSkipping DES && MD5 DER-to-PEM test'
+        TEST_CNT=$((TEST_CNT+1))
+        TEST_SKIP_CNT=$((TEST_SKIP_CNT+1))
+    fi
+
+    if [ "$HAVE_DES3" = 1 ] && [ "$HAVE_SHA" = 1 ]; then
+        USAGE_STRING="PBES1_SHA1_DES"
+        PEM_TYPE="ENCRYPTED PRIVATE KEY"
+        test_setup "Encrypt Key - PKCS#8 (PKCS#5 PBES1-SHA1-DES)"
+        der_pem_enc --pbe PBES1_SHA1_DES
+
+        USAGE_STRING="  SHA1_DES3"
+        PEM_TYPE="ENCRYPTED PRIVATE KEY"
+        test_setup "Encrypt Key - PKCS#8 (PKCS#12 PBE-SHA1-DES3)"
+        der_pem_enc --pbe-ver PKCS12 --pbe SHA1_DES3
+    else
+        echo -e '\nSkipping DES && SHA-1 DER-to-PEM tests'
+        TEST_CNT=$((TEST_CNT+2))
+        TEST_SKIP_CNT=$((TEST_SKIP_CNT+2))
+    fi
+
+    if [ "$HAVE_RC4" = 1 ] && [ "$HAVE_SHA" = 1 ]; then
+        USAGE_STRING="  SHA1_RC4_128"
+        PEM_TYPE="ENCRYPTED PRIVATE KEY"
+        test_setup "Encrypt Key - PKCS#8 (PKCS#12 PBE-SHA1-RC4-128)"
+        der_pem_enc --pbe-ver PKCS12 --pbe SHA1_RC4_128
+    else
+        echo -e '\nSkipping RC4 && SHA-1 DER-to-PEM test'
+        TEST_CNT=$((TEST_CNT+1))
+        TEST_SKIP_CNT=$((TEST_SKIP_CNT+1))
+    fi
+
+    if [ "$HAVE_RC2" = 1 ] && [ "$HAVE_SHA" = 1 ]; then
+        USAGE_STRING="SHA1_40RC2_CBC"
+        PEM_TYPE="ENCRYPTED PRIVATE KEY"
+        test_setup "Encrypt Key - PKCS#8 (PKCS#12 PBE-SHA1-40RC2-CBC)"
+        der_pem_enc --pbe-ver PKCS12 --pbe SHA1_40RC2_CBC
+    else
+        echo -e '\nSkipping RC2 && SHA-1 DER-to-PEM test'
+        TEST_CNT=$((TEST_CNT+1))
+        TEST_SKIP_CNT=$((TEST_SKIP_CNT+1))
+    fi
+else
+    echo -e '\nSkipping DES/RC4/RC2 DER-to-PEM tests'
+    TEST_CNT=$((TEST_CNT+5))
+    TEST_SKIP_CNT=$((TEST_SKIP_CNT+5))
+fi
 
 # Note: PKCS#12 with SHA1_DES doesn't work as we encode as PKCS#5 SHA1_DES as
 # ids are the same
@@ -444,9 +669,9 @@ der_pem_enc --pbe-ver PKCS12 --pbe SHA1_40RC2_CBC
 # Report results
 echo
 if [ "$TEST_SKIP_CNT" = "0" ]; then
-    echo "RESULT: $TEST_PASS_CNT/$TEST_CNT (pass/total)"
+    echo "RESULT: $TEST_PASS_CNT/$TEST_FAIL_CNT/$TEST_CNT (pass/fail/total)"
 else
-    echo "RESULT: $TEST_PASS_CNT/$TEST_SKIP_CNT/$TEST_CNT (pass/skip/total)"
+    echo "RESULT: $TEST_PASS_CNT/$TEST_SKIP_CNT/$TEST_FAIL_CNT/$TEST_CNT (pass/skip/fail/total)"
 fi
 if [ "$TEST_FAIL_CNT" != "0" ]; then
     echo "FAILURES ($TEST_FAIL_CNT):$TEST_FAIL"
@@ -457,3 +682,8 @@ fi
 # Cleanup temporaries
 do_cleanup
 
+if [ "$TEST_FAIL_CNT" = "0" ]; then
+    exit 0
+else
+    exit 1
+fi
diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c
index b9c4a9fdb93..befb652b01d 100644
--- a/wolfcrypt/test/test.c
+++ b/wolfcrypt/test/test.c
@@ -31479,7 +31479,8 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t hkdf_test(void)
 #endif /* !NO_SHA256 */
 #endif /* !NO_SHA || !NO_SHA256 */
 
-#ifndef NO_SHA256
+#if !defined(NO_SHA256) && !defined(HAVE_SELFTEST) && \
+    (!defined(HAVE_FIPS) || FIPS_VERSION3_GE(7,0,0))
     /* wc_HKDF_Extract bad arg: NULL out */
     ret = wc_HKDF_Extract(WC_SHA256, NULL, 0, ikm1, (word32)sizeof(ikm1), NULL);
     if (ret != WC_NO_ERR_TRACE(BAD_FUNC_ARG))
@@ -31488,7 +31489,8 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t hkdf_test(void)
     ret = wc_HKDF_Extract(WC_SHA256, NULL, 0, NULL, 5, okm1);
     if (ret != WC_NO_ERR_TRACE(BAD_FUNC_ARG))
         return WC_TEST_RET_ENC_EC(ret);
-#endif /* !NO_SHA256 */
+#endif /* !NO_SHA256 && !HAVE_SELFTEST &&         */
+       /* (!HAVE_FIPS || FIPS_VERSION3_GE(7,0,0)) */
 
     return 0;
 }
@@ -33426,6 +33428,7 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t srtpkdf_test(void)
     if (ret != WC_NO_ERR_TRACE(BAD_FUNC_ARG))
         ERROR_OUT(WC_TEST_RET_ENC_EC(ret), out);
 
+#if !defined(HAVE_SELFTEST) && (!defined(HAVE_FIPS) || FIPS_VERSION3_GE(7,0,0))
     /* kdrIdx >= 0 requires non-NULL idx. */
     ret = wc_SRTP_KDF(tv[i].key, tv[i].keySz, tv[i].salt, tv[i].saltSz,
         0, NULL, keyE, tv[i].keSz, keyA, tv[i].kaSz, keyS, tv[i].ksSz);
@@ -33443,6 +33446,7 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t srtpkdf_test(void)
         0, NULL, WC_SRTCP_LABEL_ENCRYPTION, keyE, tv[i].keSz);
     if (ret != WC_NO_ERR_TRACE(BAD_FUNC_ARG))
         ERROR_OUT(WC_TEST_RET_ENC_EC(ret), out);
+#endif /* !HAVE_SELFTEST && (!HAVE_FIPS || FIPS_VERSION3_GE(7,0,0)) */
 
     ret = wc_SRTP_KDF(tv[i].key, tv[i].keySz, tv[i].salt, tv[i].saltSz,
         tv[i].kdfIdx, tv[i].index, NULL, tv[i].keSz, keyA, tv[i].kaSz,