diff --git a/java/google/registry/dns/ReadDnsQueueAction.java b/java/google/registry/dns/ReadDnsQueueAction.java
index fe5899056..39843da52 100644
--- a/java/google/registry/dns/ReadDnsQueueAction.java
+++ b/java/google/registry/dns/ReadDnsQueueAction.java
@@ -32,6 +32,7 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
+import com.google.common.collect.SortedSetMultimap;
 import com.google.common.collect.TreeMultimap;
 import google.registry.config.ConfigModule.Config;
 import google.registry.dns.DnsConstants.TargetType;
@@ -121,7 +122,7 @@ public final class ReadDnsQueueAction implements Runnable {
     // each TLD will be grouped together, and domains and hosts will be grouped within a TLD. The
     // grouping and ordering of domains and hosts is not technically necessary, but a predictable
     // ordering makes it possible to write detailed tests.
-    TreeMultimap<String, RefreshItem> refreshItemMultimap = TreeMultimap.create();
+    SortedSetMultimap<String, RefreshItem> refreshItemMultimap = TreeMultimap.create();
     // Read all tasks on the DNS pull queue and load them into the refresh item multimap.
     for (TaskHandle task : tasks) {
       try {
diff --git a/javatests/google/registry/testing/UriParameters.java b/javatests/google/registry/testing/UriParameters.java
index 4d8081269..f626444db 100644
--- a/javatests/google/registry/testing/UriParameters.java
+++ b/javatests/google/registry/testing/UriParameters.java
@@ -37,7 +37,7 @@ public final class UriParameters {
    */
   public static ListMultimap<String, String> parse(String query) {
     checkNotNull(query);
-    ArrayListMultimap<String, String> map = ArrayListMultimap.create();
+    ListMultimap<String, String> map = ArrayListMultimap.create();
     if (!query.isEmpty()) {
       int start = 0;
       while (start <= query.length()) {