diff --git a/pgpainless-core/src/main/java/org/pgpainless/implementation/JceImplementationFactory.java b/pgpainless-core/src/main/java/org/pgpainless/implementation/JceImplementationFactory.java
index 31a7f128..bb3b0e0b 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/implementation/JceImplementationFactory.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/implementation/JceImplementationFactory.java
@@ -15,7 +15,6 @@ import org.bouncycastle.openpgp.PGPPrivateKey;
 import org.bouncycastle.openpgp.PGPPublicKey;
 import org.bouncycastle.openpgp.PGPSecretKey;
 import org.bouncycastle.openpgp.PGPSessionKey;
-import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory;
 import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator;
 import org.bouncycastle.openpgp.operator.PBEDataDecryptorFactory;
 import org.bouncycastle.openpgp.operator.PBEKeyEncryptionMethodGenerator;
@@ -139,11 +138,11 @@ public class JceImplementationFactory extends ImplementationFactory {
 
     @Override
     public PGPObjectFactory getPGPObjectFactory(InputStream inputStream) {
-        return new JcaPGPObjectFactory(inputStream);
+        return new PGPObjectFactory(inputStream, ImplementationFactory.getInstance().getKeyFingerprintCalculator());
     }
 
     @Override
     public PGPObjectFactory getPGPObjectFactory(byte[] bytes) {
-        return new JcaPGPObjectFactory(bytes);
+        return new PGPObjectFactory(bytes, ImplementationFactory.getInstance().getKeyFingerprintCalculator());
     }
 }
diff --git a/pgpainless-core/src/test/java/org/pgpainless/key/V6OpenPgpKeyTest.java b/pgpainless-core/src/test/java/org/pgpainless/key/V6OpenPgpKeyTest.java
index 2c1dd552..e30ce77c 100644
--- a/pgpainless-core/src/test/java/org/pgpainless/key/V6OpenPgpKeyTest.java
+++ b/pgpainless-core/src/test/java/org/pgpainless/key/V6OpenPgpKeyTest.java
@@ -4,13 +4,14 @@
 
 package org.pgpainless.key;
 
+import java.io.IOException;
+
 import org.bouncycastle.openpgp.PGPPublicKeyRing;
 import org.bouncycastle.openpgp.PGPSecretKeyRing;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestTemplate;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.pgpainless.PGPainless;
-
-import java.io.IOException;
+import org.pgpainless.util.TestAllImplementations;
 
 public class V6OpenPgpKeyTest {
 
@@ -43,12 +44,14 @@ public class V6OpenPgpKeyTest {
             "I8kWVkXU6vFOi+HWvv/ira7ofJu16NnoUkhclkUrk0mXubZvyl4GBg==\n" +
             "-----END PGP PUBLIC KEY BLOCK-----";
 
-    @Test
+    @TestTemplate
+    @ExtendWith(TestAllImplementations.class)
     public void testParseCert() throws IOException {
         PGPPublicKeyRing cert = PGPainless.readKeyRing().publicKeyRing(CERT);
     }
 
-    @Test
+    @TestTemplate
+    @ExtendWith(TestAllImplementations.class)
     public void testParseKey() throws IOException {
         PGPSecretKeyRing key = PGPainless.readKeyRing().secretKeyRing(KEY);
     }