diff --git a/javatests/google/registry/flows/host/HostUpdateFlowTest.java b/javatests/google/registry/flows/host/HostUpdateFlowTest.java
index 3b6b5101f..04f19358d 100644
--- a/javatests/google/registry/flows/host/HostUpdateFlowTest.java
+++ b/javatests/google/registry/flows/host/HostUpdateFlowTest.java
@@ -38,6 +38,7 @@ import static google.registry.util.DateTimeUtils.END_OF_TIME;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.net.InetAddresses;
 import com.googlecode.objectify.Key;
 import com.googlecode.objectify.Ref;
 import google.registry.flows.EppRequestSource;
@@ -62,7 +63,6 @@ import google.registry.model.host.HostResource;
 import google.registry.model.index.ForeignKeyIndex;
 import google.registry.model.reporting.HistoryEntry;
 import google.registry.testing.TaskQueueHelper.TaskMatcher;
-import java.net.InetAddress;
 import javax.annotation.Nullable;
 import org.joda.time.DateTime;
 import org.junit.Before;
@@ -756,10 +756,12 @@ public class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, Hos
         null,
         null);
     createTld("tld");
-    persistResource(newHostResource(oldHostName()).asBuilder()
-        .setSuperordinateDomain(Ref.create(persistActiveDomain("example.tld")))
-        .setInetAddresses(ImmutableSet.of(InetAddress.getLocalHost()))
-        .build());
+    persistResource(
+        newHostResource(oldHostName())
+            .asBuilder()
+            .setSuperordinateDomain(Ref.create(persistActiveDomain("example.tld")))
+            .setInetAddresses(ImmutableSet.of(InetAddresses.forString("127.0.0.1")))
+            .build());
     thrown.expect(RenameHostToExternalRemoveIpException.class);
     runFlow();
   }
diff --git a/javatests/google/registry/model/host/HostResourceTest.java b/javatests/google/registry/model/host/HostResourceTest.java
index a3809b590..843c7c1a5 100644
--- a/javatests/google/registry/model/host/HostResourceTest.java
+++ b/javatests/google/registry/model/host/HostResourceTest.java
@@ -23,6 +23,7 @@ import static google.registry.testing.DatastoreHelper.persistResource;
 import static google.registry.testing.HostResourceSubject.assertAboutHosts;
 
 import com.google.common.collect.ImmutableSet;
+import com.google.common.net.InetAddresses;
 import com.googlecode.objectify.Key;
 import com.googlecode.objectify.Ref;
 import google.registry.model.EntityTestCase;
@@ -71,19 +72,20 @@ public class HostResourceTest extends EntityTestCase {
                 .setTransferRequestTrid(Trid.create("client trid"))
                 .build())
             .build());
-    hostResource = cloneAndSetAutoTimestamps(
-        new HostResource.Builder()
-            .setRepoId("DEADBEEF-COM")
-            .setFullyQualifiedHostName("ns1.example.com")
-            .setCreationClientId("a registrar")
-            .setLastEppUpdateTime(clock.nowUtc())
-            .setLastEppUpdateClientId("another registrar")
-            .setLastTransferTime(clock.nowUtc())
-            .setInetAddresses(ImmutableSet.of(InetAddress.getLocalHost()))
-            .setStatusValues(ImmutableSet.of(StatusValue.OK))
-            .setSuperordinateDomain(Ref.create(
-                loadByUniqueId(DomainResource.class, "example.com", clock.nowUtc())))
-            .build());
+    hostResource =
+        cloneAndSetAutoTimestamps(
+            new HostResource.Builder()
+                .setRepoId("DEADBEEF-COM")
+                .setFullyQualifiedHostName("ns1.example.com")
+                .setCreationClientId("a registrar")
+                .setLastEppUpdateTime(clock.nowUtc())
+                .setLastEppUpdateClientId("another registrar")
+                .setLastTransferTime(clock.nowUtc())
+                .setInetAddresses(ImmutableSet.of(InetAddresses.forString("127.0.0.1")))
+                .setStatusValues(ImmutableSet.of(StatusValue.OK))
+                .setSuperordinateDomain(
+                    Ref.create(loadByUniqueId(DomainResource.class, "example.com", clock.nowUtc())))
+                .build());
     persistResource(hostResource);
   }
 
@@ -139,9 +141,12 @@ public class HostResourceTest extends EntityTestCase {
     assertThat(new HostResource.Builder()
         .setInetAddresses(ImmutableSet.<InetAddress>of()).build().inetAddresses)
             .isNull();
-    assertThat(new HostResource.Builder()
-        .setInetAddresses(ImmutableSet.of(InetAddress.getLocalHost())).build().inetAddresses)
-            .isNotNull();
+    assertThat(
+            new HostResource.Builder()
+                .setInetAddresses(ImmutableSet.of(InetAddresses.forString("127.0.0.1")))
+                .build()
+                .inetAddresses)
+        .isNotNull();
   }
 
   @Test