diff --git a/pkcs7/pkcs7-verify.c b/pkcs7/pkcs7-verify.c
index 559f383a1..8ddb855ac 100644
--- a/pkcs7/pkcs7-verify.c
+++ b/pkcs7/pkcs7-verify.c
@@ -18,7 +18,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  */
+#ifndef WOLFSSL_USER_SETTINGS
 #include <wolfssl/options.h>
+#endif
 #include <wolfssl/wolfcrypt/settings.h>
 #include <wolfssl/wolfcrypt/pkcs7.h>
 #include <wolfssl/wolfcrypt/error-crypt.h>
@@ -26,11 +28,16 @@
 
 #ifdef HAVE_PKCS7
 
+static const char* pkcs7SignedDer = "signed.p7b"; /* DER */
+static const char* pkcs7SignedPem = "signed.p7s"; /* PEM */
+
 int main(int argc, char** argv)
 {
     int rc = 0;
     PKCS7 pkcs7;
     XFILE derFile;
+    byte* fileBuf = NULL;
+    word32 fileSz = 0;
     byte* derBuf = NULL;
     word32 derSz = 0;
 
@@ -41,40 +48,94 @@ int main(int argc, char** argv)
     wolfSSL_Debugging_ON();
 #endif
 
-    /* load DER PKCS7 */
-    derFile = fopen("signed.p7s", "rb");
+    /* load PKCS7 */
+    derFile = fopen(pkcs7SignedPem, "rb");
     if (derFile) {
         fseek(derFile, 0, SEEK_END);
-        derSz = (int)ftell(derFile);
+        fileSz = (int)ftell(derFile);
         rewind(derFile);
 
-        derBuf = (byte*)XMALLOC(derSz, NULL, DYNAMIC_TYPE_TMP_BUFFER);
-        if (derBuf == NULL) {
+        fileBuf = (byte*)XMALLOC(fileSz, NULL, DYNAMIC_TYPE_TMP_BUFFER);
+        derBuf = (byte*)XMALLOC(fileSz, NULL, DYNAMIC_TYPE_TMP_BUFFER);
+        if (fileBuf == NULL || derBuf == NULL) {
             rc = MEMORY_E; goto exit;
         }
+        derSz = fileSz;
 
-        rc = (int)fread(derBuf, 1, derSz, derFile);
+        rc = (int)fread(fileBuf, 1, fileSz, derFile);
         fclose(derFile);
 
-        if (rc != derSz) {
+        if (rc != fileSz) {
             printf("Failed to read der file!\n");
-            return -1;
+            rc = -1;
+            goto exit;
         }
+        rc = 0;
     }
 
-    printf("Der %d\n", derSz);
-    WOLFSSL_BUFFER(derBuf, derSz);
+    /* PKCS_Init captures/saves this, so make sure
+     * isDynamic = 0 since it is on the stack */
+    pkcs7.isDynamic = 0;
 
     /* Test verify */
     rc = wc_PKCS7_Init(&pkcs7, NULL, INVALID_DEVID);
     if (rc != 0) goto exit;
     rc = wc_PKCS7_InitWithCert(&pkcs7, NULL, 0);
     if (rc != 0) goto exit;
+
+    /* convert PEM to DER */
+    rc = wc_CertPemToDer(fileBuf, fileSz, derBuf, derSz, PKCS7_TYPE);
+    if (rc < 0) {
+        goto exit;
+    }
+    derSz = rc;
+    rc = 0;
+
+    printf("Der %d\n", derSz);
+    WOLFSSL_BUFFER(derBuf, derSz);
+
     rc = wc_PKCS7_VerifySignedData(&pkcs7, derBuf, derSz);
     if (rc != 0) goto exit;
 
     printf("PKCS7 Verify Success\n");
 
+    #ifdef WOLFSSL_DER_TO_PEM
+        memset(fileBuf, 0, fileSz);
+        rc = wc_DerToPem(derBuf, derSz, fileBuf, fileSz, PKCS7_TYPE);
+        if (rc <= 0) {
+            printf("DER to PEM failed: %d\n", rc);
+            goto exit;
+        }
+        printf("%s", fileBuf);
+    #endif
+
+    /* load PKCS7 */
+    derFile = fopen(pkcs7SignedDer, "rb");
+    if (derFile) {
+        fseek(derFile, 0, SEEK_END);
+        fileSz = (int)ftell(derFile);
+        rewind(derFile);
+
+        rc = (int)fread(fileBuf, 1, fileSz, derFile);
+        fclose(derFile);
+
+        if (rc != fileSz) {
+            printf("Failed to read der file!\n");
+            rc = -1;
+            goto exit;
+        }
+        rc = 0;
+    }
+
+    /* Verify DER output matches expected output */
+    if (fileSz != derSz || memcmp(fileBuf, derBuf, derSz) != 0) {
+        fprintf(stderr, "DER output didn't match expected\n");
+        rc = -1;
+    }
+    else {
+        printf("DER output matches the original PEM\n");
+    }
+
 exit:
 
     if (rc != 0)
@@ -82,6 +143,7 @@ int main(int argc, char** argv)
 
     wc_PKCS7_Free(&pkcs7);
     XFREE(derBuf, NULL, DYNAMIC_TYPE_TMP_BUFFER);
+    XFREE(fileBuf, NULL, DYNAMIC_TYPE_TMP_BUFFER);
 
     return rc;
 }
@@ -94,4 +156,4 @@ int main(int argc, char** argv)
     return 0;
 }
 
-#endif
+#endif
\ No newline at end of file
diff --git a/pkcs7/signed.p7b b/pkcs7/signed.p7b
new file mode 100644
index 000000000..e1e6280c2
Binary files /dev/null and b/pkcs7/signed.p7b differ
diff --git a/pkcs7/signed.p7s b/pkcs7/signed.p7s
index e1e6280c2..f9da08e11 100755
Binary files a/pkcs7/signed.p7s and b/pkcs7/signed.p7s differ