diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/WellKnownThreadSafety.java b/core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/WellKnownThreadSafety.java
index 63c08dbda4ff..0824e83c2212 100644
--- a/core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/WellKnownThreadSafety.java
+++ b/core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/WellKnownThreadSafety.java
@@ -102,6 +102,8 @@ private static ImmutableMap<String, AnnotationInfo> buildThreadSafeClasses(
         .add(java.util.concurrent.locks.ReadWriteLock.class)
         .add(java.util.concurrent.locks.ReentrantLock.class)
         .add(java.util.concurrent.locks.ReentrantReadWriteLock.class)
+        .add(java.security.cert.X509Certificate.class)
+        .add(java.security.cert.TrustAnchor.class)
         .add(java.security.SecureRandom.class)
         .add("com.google.common.time.Clock")
         .add("com.google.common.time.TimeSource")
@@ -138,6 +140,8 @@ private static ImmutableMap<String, AnnotationInfo> buildThreadSafeClasses(
         .add("kotlinx.coroutines.sync.Mutex")
         .add("kotlinx.coroutines.sync.Semaphore")
         .add("kotlin.Unit")
+        .add("org.bouncycastle.cms.CMSSignedData")
+        .add("org.bouncycastle.pkcs.PKCS10CertificationRequest")
         .build();
   }