diff --git a/server/site_tests/autoupdate_P2P/autoupdate_P2P.py b/server/site_tests/autoupdate_P2P/autoupdate_P2P.py
index 8c1f2a5..c0cf690 100644
--- a/server/site_tests/autoupdate_P2P/autoupdate_P2P.py
+++ b/server/site_tests/autoupdate_P2P/autoupdate_P2P.py
@@ -205,11 +205,10 @@
         line1 = "Checking if payload is available via p2p, file_id=" \
                 "cros_update_size_(.*)_hash_(.*)"
         line2 = "Lookup complete, p2p-client returned URL " \
-                "'http://%s:(.*)/cros_update_size_(.*)_hash_(.*).cros_au'" % \
-                self._hosts[0].ip
+                "'http://(.*)/cros_update_size_(.*)_hash_(.*).cros_au'"
         line3 = "Replacing URL (.*) with local URL " \
-                "http://%s:(.*)/cros_update_size_(.*)_hash_(.*).cros_au " \
-                "since p2p is enabled." % self._hosts[0].ip
+                "http://(.*)/cros_update_size_(.*)_hash_(.*).cros_au " \
+                "since p2p is enabled."
         errline = "Forcibly disabling use of p2p for downloading because no " \
                   "suitable peer could be found."
         too_many_attempts_err_str = "Forcibly disabling use of p2p for " \
diff --git a/server/site_tests/autoupdate_P2P/control.delta b/server/site_tests/autoupdate_P2P/control.delta
index 04edb20..9c202d1 100644
--- a/server/site_tests/autoupdate_P2P/control.delta
+++ b/server/site_tests/autoupdate_P2P/control.delta
@@ -11,6 +11,7 @@
 TEST_TYPE = "server"
 ATTRIBUTES = "suite:bvt-perbuild"
 SYNC_COUNT = 2
+JOB_RETRIES = 2
 DOC = """
 This tests autoupdate between two devices via peer to peer.