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 41e1b070fdf..345e416e9bb 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
@@ -63,8 +63,10 @@ private static ImmutableMap<String, AnnotationInfo> buildThreadSafeClasses(
     new MapBuilder()
         .addAll(mutability.getKnownImmutableClasses())
         .addStrings(extraKnownThreadSafe)
-        .add(ClassLoader.class)
-        .add(Thread.class)
+        .add(java.lang.ClassLoader.class)
+        .add(java.lang.Thread.class)
+        .add(java.time.InstantSource.class)
+        .add(java.time.Clock.class)
         .add(java.util.Random.class)
         .add(java.util.concurrent.atomic.AtomicBoolean.class)
         .add(java.util.concurrent.atomic.AtomicInteger.class)
@@ -108,8 +110,6 @@ private static ImmutableMap<String, AnnotationInfo> buildThreadSafeClasses(
         .add(java.security.SecureRandom.class)
         .add("com.google.common.base.Ticker")
         .add("com.google.common.testing.FakeTicker")
-        .add("com.google.common.time.Clock")
-        .add("com.google.common.time.TimeSource")
         .add("com.google.common.util.concurrent.AtomicLongMap", "K")
         .add("com.google.common.util.concurrent.CheckedFuture", "V", "X")
         .add("com.google.common.util.concurrent.ListeningExecutorService")