diff --git a/core/.attach_pid2322753 b/core/.attach_pid2322753
new file mode 100644
index 000000000..e69de29bb
diff --git a/core/src/test/java/google/registry/model/tld/RegistryLockDaoTest.java b/core/src/test/java/google/registry/model/tld/RegistryLockDaoTest.java
index f0827ebfe..d28ba816d 100644
--- a/core/src/test/java/google/registry/model/tld/RegistryLockDaoTest.java
+++ b/core/src/test/java/google/registry/model/tld/RegistryLockDaoTest.java
@@ -16,6 +16,7 @@ package google.registry.model.tld;
 
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth8.assertThat;
 import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm;
 import static google.registry.testing.SqlHelper.getMostRecentRegistryLockByRepoId;
 import static google.registry.testing.SqlHelper.getMostRecentUnlockedRegistryLockByRepoId;
@@ -67,7 +68,7 @@ public final class RegistryLockDaoTest extends EntityTestCase {
             () -> {
               RegistryLock fromDatabase =
                   RegistryLockDao.getByVerificationCode(lock.getVerificationCode()).get();
-              assertThat(fromDatabase.getLockCompletionTime().get()).isEqualTo(fakeClock.nowUtc());
+              assertThat(fromDatabase.getLockCompletionTime()).hasValue(fakeClock.nowUtc());
               assertThat(fromDatabase.getLastUpdateTime()).isEqualTo(fakeClock.nowUtc());
             });
   }
@@ -87,7 +88,7 @@ public final class RegistryLockDaoTest extends EntityTestCase {
     assertThat(fromDatabase.getUnlockRequestTime()).isEqualTo(Optional.of(fakeClock.nowUtc()));
     assertThat(fromDatabase.getUnlockCompletionTime()).isEqualTo(Optional.of(fakeClock.nowUtc()));
     assertThat(fromDatabase.isLocked()).isFalse();
-    assertThat(fromDatabase.getRelockDuration().get()).isEqualTo(Duration.standardHours(6));
+    assertThat(fromDatabase.getRelockDuration()).hasValue(Duration.standardHours(6));
   }
 
   @Test
diff --git a/core/src/test/java/google/registry/model/tld/RegistryTest.java b/core/src/test/java/google/registry/model/tld/RegistryTest.java
index 4f687fe18..38b6d3a6e 100644
--- a/core/src/test/java/google/registry/model/tld/RegistryTest.java
+++ b/core/src/test/java/google/registry/model/tld/RegistryTest.java
@@ -261,8 +261,8 @@ public final class RegistryTest extends EntityTestCase {
     Registry registry = Registry.get("tld").asBuilder().setPremiumList(pl2).build();
     Optional<String> pl = registry.getPremiumListName();
     assertThat(pl).hasValue("tld2");
-    PremiumList stored = PremiumListDao.getLatestRevision(pl.get()).get();
-    assertThat(stored.getName()).isEqualTo("tld2");
+    assertThat(PremiumListDao.getLatestRevision("tld2")).isPresent();
+    assertThat(PremiumListDao.getLatestRevision("tld2").get().getName()).isEqualTo("tld2");
   }
 
   @TestOfyAndSql
diff --git a/core/src/test/java/google/registry/model/tld/label/PremiumListDaoTest.java b/core/src/test/java/google/registry/model/tld/label/PremiumListDaoTest.java
index 7d925be42..587a23f8c 100644
--- a/core/src/test/java/google/registry/model/tld/label/PremiumListDaoTest.java
+++ b/core/src/test/java/google/registry/model/tld/label/PremiumListDaoTest.java
@@ -261,7 +261,7 @@ public class PremiumListDaoTest {
     assertThat(PremiumListDao.premiumListCache.getIfPresent("testname")).isNull();
     PremiumListDao.save(testList);
     PremiumList pl = PremiumListDao.getLatestRevision("testname").get();
-    assertThat(PremiumListDao.premiumListCache.getIfPresent("testname").get()).isEqualTo(pl);
+    assertThat(PremiumListDao.premiumListCache.getIfPresent("testname")).hasValue(pl);
     TransactionManagerUtil.transactIfJpaTm(
         () -> PremiumListDao.save("testname", USD, ImmutableList.of("test,USD 1")));
     assertThat(PremiumListDao.premiumListCache.getIfPresent("testname")).isNull();
diff --git a/core/src/test/java/google/registry/model/tld/label/PremiumListTest.java b/core/src/test/java/google/registry/model/tld/label/PremiumListTest.java
index 5070ae10a..9c72fa5b0 100644
--- a/core/src/test/java/google/registry/model/tld/label/PremiumListTest.java
+++ b/core/src/test/java/google/registry/model/tld/label/PremiumListTest.java
@@ -16,6 +16,7 @@ package google.registry.model.tld.label;
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
+import static com.google.common.truth.Truth8.assertThat;
 import static google.registry.testing.DatabaseHelper.createTld;
 import static google.registry.testing.DatabaseHelper.persistPremiumList;
 import static google.registry.testing.DatabaseHelper.persistReservedList;
@@ -100,8 +101,8 @@ public class PremiumListTest {
   @Test
   void testParse_canIncludeOrNotIncludeCurrencyUnit() {
     PremiumListDao.save("tld", USD, ImmutableList.of("rofl,USD 90", "paper, 80"));
-    assertThat(PremiumListDao.getPremiumPrice("tld", "rofl").get()).isEqualTo(Money.of(USD, 90));
-    assertThat(PremiumListDao.getPremiumPrice("tld", "paper").get()).isEqualTo(Money.of(USD, 80));
+    assertThat(PremiumListDao.getPremiumPrice("tld", "rofl")).hasValue(Money.of(USD, 90));
+    assertThat(PremiumListDao.getPremiumPrice("tld", "paper")).hasValue(Money.of(USD, 80));
   }
 
   @Test
diff --git a/core/src/test/java/google/registry/model/tmch/TmchCrlTest.java b/core/src/test/java/google/registry/model/tmch/TmchCrlTest.java
index a2b0de431..6d8b7294e 100644
--- a/core/src/test/java/google/registry/model/tmch/TmchCrlTest.java
+++ b/core/src/test/java/google/registry/model/tmch/TmchCrlTest.java
@@ -15,9 +15,9 @@
 package google.registry.model.tmch;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth8.assertThat;
 
 import google.registry.model.EntityTestCase;
-import java.util.Optional;
 import org.junit.jupiter.api.Test;
 
 /** Unit tests for {@link TmchCrl}. */
@@ -29,7 +29,7 @@ public class TmchCrlTest extends EntityTestCase {
 
   @Test
   void testSuccess() {
-    assertThat(TmchCrl.get()).isEqualTo(Optional.empty());
+    assertThat(TmchCrl.get()).isEmpty();
     TmchCrl.set("lolcat", "https://lol.cat");
     assertThat(TmchCrl.get().get().getCrl()).isEqualTo("lolcat");
   }
diff --git a/core/src/test/java/google/registry/ui/forms/FormFieldTest.java b/core/src/test/java/google/registry/ui/forms/FormFieldTest.java
index b1704541c..e35a1aee8 100644
--- a/core/src/test/java/google/registry/ui/forms/FormFieldTest.java
+++ b/core/src/test/java/google/registry/ui/forms/FormFieldTest.java
@@ -51,7 +51,7 @@ class FormFieldTest {
 
   @Test
   void testConvert_emptyString_returnsEmpty() {
-    assertThat(FormField.named("lol").build().convert("").get()).isEmpty();
+    assertThat(FormField.named("lol").build().convert("")).hasValue("");
   }
 
   @Test
@@ -249,7 +249,8 @@ class FormFieldTest {
 
   @Test
   void testAsList_empty_returnsEmpty() {
-    assertThat(FormField.named("lol").asList().build().convert(ImmutableList.of()).get()).isEmpty();
+    assertThat(FormField.named("lol").asList().build().convert(ImmutableList.of()))
+        .hasValue(ImmutableList.of());
   }
 
   @Test
@@ -277,16 +278,16 @@ class FormFieldTest {
   void testAsEnum() {
     FormField<String, ICanHazEnum> omgField =
         FormField.named("omg").asEnum(ICanHazEnum.class).build();
-    assertThat(omgField.convert("LOL").get()).isEqualTo(ICanHazEnum.LOL);
-    assertThat(omgField.convert("CAT").get()).isEqualTo(ICanHazEnum.CAT);
+    assertThat(omgField.convert("LOL")).hasValue(ICanHazEnum.LOL);
+    assertThat(omgField.convert("CAT")).hasValue(ICanHazEnum.CAT);
   }
 
   @Test
   void testAsEnum_lowercase_works() {
     FormField<String, ICanHazEnum> omgField =
         FormField.named("omg").asEnum(ICanHazEnum.class).build();
-    assertThat(omgField.convert("lol").get()).isEqualTo(ICanHazEnum.LOL);
-    assertThat(omgField.convert("cat").get()).isEqualTo(ICanHazEnum.CAT);
+    assertThat(omgField.convert("lol")).hasValue(ICanHazEnum.LOL);
+    assertThat(omgField.convert("cat")).hasValue(ICanHazEnum.CAT);
   }
 
   @Test