diff --git a/pgpainless-cli/src/test/java/org/pgpainless/cli/commands/RoundTripEncryptDecryptCmdTest.java b/pgpainless-cli/src/test/java/org/pgpainless/cli/commands/RoundTripEncryptDecryptCmdTest.java
index fdc341b0..e03553f4 100644
--- a/pgpainless-cli/src/test/java/org/pgpainless/cli/commands/RoundTripEncryptDecryptCmdTest.java
+++ b/pgpainless-cli/src/test/java/org/pgpainless/cli/commands/RoundTripEncryptDecryptCmdTest.java
@@ -136,7 +136,6 @@ public class RoundTripEncryptDecryptCmdTest extends CLITest {
     }
 
     @Test
-    // @Disabled("Disabled, since we now read certificates from secret keys")
     public void testEncryptingForKeyFails() throws IOException {
         File notACert = writeFile("key.asc", KEY);
 
diff --git a/pgpainless-core/src/test/kotlin/org/pgpainless/key/KeyWithUnknownSecretKeyEncryptionMethodTest.kt b/pgpainless-core/src/test/kotlin/org/pgpainless/key/KeyWithUnknownSecretKeyEncryptionMethodTest.kt
index b45bfa39..cd79103a 100644
--- a/pgpainless-core/src/test/kotlin/org/pgpainless/key/KeyWithUnknownSecretKeyEncryptionMethodTest.kt
+++ b/pgpainless-core/src/test/kotlin/org/pgpainless/key/KeyWithUnknownSecretKeyEncryptionMethodTest.kt
@@ -29,7 +29,7 @@ DhxJVTgA/1WaFrKdP3AgL0Ffdooc5XXbjQsj0uHo6FZSHRI4pchMAQCyJnKQ3RvW
 -----END PGP PRIVATE KEY BLOCK-----"""
 
     @Test
-    @Disabled("Disabled since BC 1.77 chokes on the test key")
+    @Disabled("Disabled since BC 1.82 chokes on the test key")
     fun testExtractCertificate() {
         val key = PGPainless.getInstance().readKey().parseKey(KEY)!!
         val cert = key.toCertificate()
diff --git a/pgpainless-sop/src/test/java/sop/testsuite/pgpainless/operation/PGPainlessDetachedSignDetachedVerifyTest.java b/pgpainless-sop/src/test/java/sop/testsuite/pgpainless/operation/PGPainlessDetachedSignDetachedVerifyTest.java
index 28fc3d6a..b2bc8ab2 100644
--- a/pgpainless-sop/src/test/java/sop/testsuite/pgpainless/operation/PGPainlessDetachedSignDetachedVerifyTest.java
+++ b/pgpainless-sop/src/test/java/sop/testsuite/pgpainless/operation/PGPainlessDetachedSignDetachedVerifyTest.java
@@ -4,7 +4,6 @@
 
 package sop.testsuite.pgpainless.operation;
 
-import org.junit.jupiter.api.Disabled;
 import sop.SOP;
 import sop.testsuite.operation.DetachedSignDetachedVerifyTest;
 
@@ -13,13 +12,11 @@ import java.io.IOException;
 public class PGPainlessDetachedSignDetachedVerifyTest extends DetachedSignDetachedVerifyTest {
 
     @Override
-    @Disabled("Since we allow for dynamic cert loading, we can ignore this test")
     public void verifyMissingCertCausesMissingArg(SOP sop) {
         super.verifyMissingCertCausesMissingArg(sop);
     }
 
     @Override
-    @Disabled("Carol is an ElGamal key, which are no longer supported.")
     public void signVerifyWithCarolKey(SOP sop) throws IOException {
         super.signVerifyWithCarolKey(sop);
     }
diff --git a/pgpainless-sop/src/test/java/sop/testsuite/pgpainless/operation/PGPainlessExtractCertTest.java b/pgpainless-sop/src/test/java/sop/testsuite/pgpainless/operation/PGPainlessExtractCertTest.java
index ee4e9684..daa90a5c 100644
--- a/pgpainless-sop/src/test/java/sop/testsuite/pgpainless/operation/PGPainlessExtractCertTest.java
+++ b/pgpainless-sop/src/test/java/sop/testsuite/pgpainless/operation/PGPainlessExtractCertTest.java
@@ -6,25 +6,21 @@ package sop.testsuite.pgpainless.operation;
 
 import java.io.IOException;
 
-import org.junit.jupiter.api.Disabled;
 import sop.SOP;
 import sop.testsuite.operation.ExtractCertTest;
 
 public class PGPainlessExtractCertTest extends ExtractCertTest {
 
-    @Disabled("BC uses old CTBs causing mismatching byte arrays :/")
     @Override
     public void extractAliceCertFromAliceKeyTest(SOP sop) throws IOException {
         super.extractAliceCertFromAliceKeyTest(sop);
     }
 
-    @Disabled("BC uses old CTBs causing mismatching byte arrays :/")
     @Override
     public void extractBobsCertFromBobsKeyTest(SOP sop) throws IOException {
         super.extractBobsCertFromBobsKeyTest(sop);
     }
 
-    @Disabled("BC uses old CTBs causing mismatching byte arrays :/")
     @Override
     public void extractCarolsCertFromCarolsKeyTest(SOP sop) throws IOException {
         super.extractCarolsCertFromCarolsKeyTest(sop);
diff --git a/pgpainless-sop/src/test/java/sop/testsuite/pgpainless/operation/PGPainlessInlineSignInlineVerifyTest.java b/pgpainless-sop/src/test/java/sop/testsuite/pgpainless/operation/PGPainlessInlineSignInlineVerifyTest.java
index deb9d6b5..22a7258e 100644
--- a/pgpainless-sop/src/test/java/sop/testsuite/pgpainless/operation/PGPainlessInlineSignInlineVerifyTest.java
+++ b/pgpainless-sop/src/test/java/sop/testsuite/pgpainless/operation/PGPainlessInlineSignInlineVerifyTest.java
@@ -4,7 +4,6 @@
 
 package sop.testsuite.pgpainless.operation;
 
-import org.junit.jupiter.api.Disabled;
 import sop.SOP;
 import sop.testsuite.operation.InlineSignInlineVerifyTest;
 
@@ -13,7 +12,6 @@ import java.io.IOException;
 public class PGPainlessInlineSignInlineVerifyTest extends InlineSignInlineVerifyTest {
 
     @Override
-    @Disabled("Carol is an ElGamal key, which is no longer supported.")
     public void inlineSignVerifyCarol(SOP sop) throws IOException {
         super.inlineSignVerifyCarol(sop);
     }