diff --git a/iped-parsers/iped-parsers-impl/src/test/java/iped/parsers/security/CertificateParserTest.java b/iped-parsers/iped-parsers-impl/src/test/java/iped/parsers/security/CertificateParserTest.java
index 15a967b990..9025a4c1b9 100644
--- a/iped-parsers/iped-parsers-impl/src/test/java/iped/parsers/security/CertificateParserTest.java
+++ b/iped-parsers/iped-parsers-impl/src/test/java/iped/parsers/security/CertificateParserTest.java
@@ -2,10 +2,15 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
 import java.text.DateFormat;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 import org.apache.tika.exception.TikaException;
+import org.apache.tika.extractor.EmbeddedDocumentExtractor;
 import org.apache.tika.metadata.Metadata;
 import org.apache.tika.metadata.TikaCoreProperties;
 import org.apache.tika.parser.ParseContext;
@@ -154,46 +159,36 @@ public void testCertificateParsingPKCS7() throws IOException, SAXException, Tika
         ContentHandler handler = new BodyContentHandler();
         ParseContext context = new ParseContext();
         parser.getSupportedTypes(context);
-        try (InputStream stream = getStream("test-files/test_serverPKCS7.p7b")) {
-            parser.parse(stream, handler, metadata, context);
-            String hts = handler.toString();
 
-            assertTrue(hts.contains("Propriedade"));
-            assertTrue(hts.contains("Valor"));
-            assertTrue(hts.contains("Subject"));
-            assertTrue(hts.contains(
-                    "1.2.840.113549.1.9.1=#161b6775696c6865726d65616e64726575636540676d61696c2e636f6d,CN=pf.gov.br,OU=PF,O=Polícia Federal,L=Asa Sul,ST=Brasília,C=BR"));
-            assertTrue(hts.contains("Version"));
-            assertTrue(hts.contains("3"));
-            assertTrue(hts.contains("Serial Number"));
-            assertTrue(hts.contains("12677675471164634689"));
-            assertTrue(hts.contains("Signature Algorithm"));
-            assertTrue(hts.contains("SHA1withRSA"));
-            assertTrue(hts.contains("Issuer"));
-            assertTrue(hts.contains(
-                    "1.2.840.113549.1.9.1=#161b6775696c6865726d65616e64726575636540676d61696c2e636f6d,CN=pf.gov.br,OU=PF,O=Polícia Federal,L=Asa Sul,ST=Brasília,C=BR"));
-            assertTrue(hts.contains("Valid from"));
-            DateFormat df = DateFormat.getDateTimeInstance();
-            assertTrue(hts.contains(df.format(new Date(1622568518000L))));
-            assertTrue(hts.contains("Valid to"));
-            assertTrue(hts.contains(df.format(new Date(1625160518000L))));
-            assertTrue(hts.contains("Alternative Names:"));
-            assertTrue(hts.contains("This certificate has no alternative names."));
+        List<Exception> exceptions = new ArrayList<>();
+        List<X509Certificate> certificates = new ArrayList<>();
 
-            assertEquals(
-                    "1.2.840.113549.1.9.1=#161b6775696c6865726d65616e64726575636540676d61696c2e636f6d,CN=pf.gov.br,OU=PF,O=Polícia Federal,L=Asa Sul,ST=Brasília,C=BR",
-                    metadata.get(CertificateParser.SUBJECT));
-            assertEquals("2021-07-01", metadata.get(CertificateParser.NOTAFTER).substring(0, 10));
-            assertEquals(
-                    "Certificado:1.2.840.113549.1.9.1=#161b6775696c6865726d65616e64726575636540676d61696c2e636f6d,CN=pf.gov.br,OU=PF,O=Polícia Federal,L=Asa Sul,ST=Brasília,C=BR",
-                    metadata.get(TikaCoreProperties.TITLE));
-            assertEquals(CertificateParser.PKCS7_SIGNATURE.toString(), metadata.get(StandardParser.INDEXER_CONTENT_TYPE));
-            assertEquals("true", metadata.get(CertificateParser.ISSUBJECTAUTHORITY));
-            assertEquals(
-                    "1.2.840.113549.1.9.1=#161b6775696c6865726d65616e64726575636540676d61696c2e636f6d,CN=pf.gov.br,OU=PF,O=Polícia Federal,L=Asa Sul,ST=Brasília,C=BR",
-                    metadata.get(CertificateParser.ISSUER));
-            assertEquals("2021-06-01", metadata.get(CertificateParser.NOTBEFORE).substring(0, 10));
-            assertEquals("text/plain", metadata.get(HttpHeaders.CONTENT_TYPE));
+        context.set(EmbeddedDocumentExtractor.class, new EmbeddedDocumentExtractor() {
+            @Override
+            public boolean shouldParseEmbedded(Metadata arg0) {
+                return true;
+            }
+
+            @Override
+            public void parseEmbedded(InputStream stream, ContentHandler arg1, Metadata metadata, boolean arg3)
+                    throws SAXException, IOException {
+                try {
+                    CertificateFactory cf = CertificateFactory.getInstance("X.509");
+                    X509Certificate cert = (X509Certificate) cf.generateCertificate(stream);
+                } catch (Exception e) {
+                    exceptions.add(e);
+                } finally {
+                }
+            }
+        });
+
+        try (InputStream stream = getStream("test-files/test_serverPKCS7.p7b")) {
+            parser.parse(stream, handler, metadata, context);
+            
+            assertEquals(exceptions.size(), 0);
+            assertEquals(certificates.size(), 1);
+            assertEquals(certificates.get(0).getSubjectDN().toString(),
+                    "1.2.840.113549.1.9.1=#161b6775696c6865726d65616e64726575636540676d61696c2e636f6d,CN=pf.gov.br,OU=PF,O=Polícia Federal,L=Asa Sul,ST=Brasília,C=BR");
 
         }