diff --git a/core/src/main/java/google/registry/tools/javascrap/BackfillRegistryLocksCommand.java b/core/src/main/java/google/registry/tools/javascrap/BackfillRegistryLocksCommand.java
index 9de166140..adcaa7362 100644
--- a/core/src/main/java/google/registry/tools/javascrap/BackfillRegistryLocksCommand.java
+++ b/core/src/main/java/google/registry/tools/javascrap/BackfillRegistryLocksCommand.java
@@ -26,7 +26,6 @@ import com.beust.jcommander.Parameters;
 import com.google.common.collect.ImmutableCollection;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Streams;
 import com.google.common.flogger.FluentLogger;
 import google.registry.config.RegistryConfig.Config;
 import google.registry.model.domain.DomainBase;
@@ -134,10 +133,10 @@ public class BackfillRegistryLocksCommand extends ConfirmingCommand
   private DateTime getLockCompletionTimestamp(DomainBase domainBase, DateTime now) {
     // Best-effort, if a domain was URS-locked we should use that time
     // If we can't find that, return now.
-    return Streams.stream(HistoryEntryDao.loadHistoryObjectsForResource(domainBase.createVKey()))
+    return HistoryEntryDao.loadHistoryObjectsForResource(domainBase.createVKey()).stream()
         // sort by modification time descending so we get the most recent one if it was locked twice
         .sorted(Comparator.comparing(HistoryEntry::getModificationTime).reversed())
-        .filter(entry -> entry.getReason().equals("Uniform Rapid Suspension"))
+        .filter(entry -> "Uniform Rapid Suspension".equals(entry.getReason()))
         .findFirst()
         .map(HistoryEntry::getModificationTime)
         .orElse(now);
diff --git a/core/src/test/java/google/registry/tools/javascrap/BackfillRegistryLocksCommandTest.java b/core/src/test/java/google/registry/tools/javascrap/BackfillRegistryLocksCommandTest.java
index 9192e3172..7fa298746 100644
--- a/core/src/test/java/google/registry/tools/javascrap/BackfillRegistryLocksCommandTest.java
+++ b/core/src/test/java/google/registry/tools/javascrap/BackfillRegistryLocksCommandTest.java
@@ -127,7 +127,7 @@ class BackfillRegistryLocksCommandTest extends CommandTestCase<BackfillRegistryL
   void testBackfill_usesUrsTime_ifExists() throws Exception {
     DateTime ursTime = fakeClock.nowUtc();
     DomainBase ursDomain = persistLockedDomain("urs.tld");
-    HistoryEntry historyEntry =
+    persistResource(
         new DomainHistory.Builder()
             .setBySuperuser(true)
             .setClientId("adminreg")
@@ -136,9 +136,17 @@ class BackfillRegistryLocksCommandTest extends CommandTestCase<BackfillRegistryL
             .setReason("Uniform Rapid Suspension")
             .setType(HistoryEntry.Type.DOMAIN_UPDATE)
             .setRequestedByRegistrar(false)
-            .build();
-    persistResource(historyEntry);
+            .build());
     DomainBase nonUrsDomain = persistLockedDomain("nonurs.tld");
+    persistResource(
+        new DomainHistory.Builder()
+            .setBySuperuser(true)
+            .setClientId("adminreg")
+            .setDomain(nonUrsDomain)
+            .setType(HistoryEntry.Type.DOMAIN_UPDATE)
+            .setRequestedByRegistrar(false)
+            .setModificationTime(ursTime)
+            .build());
 
     fakeClock.advanceBy(Duration.standardDays(10));
     runCommandForced(