diff --git a/tests/test_gossip.py b/tests/test_gossip.py
index b69531f8006f..6193373e0565 100644
--- a/tests/test_gossip.py
+++ b/tests/test_gossip.py
@@ -129,8 +129,8 @@ def test_announce_address(node_factory, bitcoind):
     l1.daemon.wait_for_log(r"\[OUT\] 0101.*47"
                            "010102030404d2"
                            "017f000001...."
-                           "02000000000000000000000000000000002607"
-                           "04e00533f3e8f2aedaa8969b3d0fa03a96e857bbb28064dca5e147e934244b9ba50230032607")
+                           "02000000000000000000000000000000004d86"
+                           "04e00533f3e8f2aedaa8969b3d0fa03a96e857bbb28064dca5e147e934244b9ba50230034d86")
 
 
 @pytest.mark.developer("needs DEVELOPER=1")
@@ -935,7 +935,7 @@ def test_gossip_addresses(node_factory, bitcoind):
         {'type': 'ipv4', 'address': '127.0.0.1', 'port': 2},
         {'type': 'ipv6', 'address': '::', 'port': 3},
         {'type': 'torv2', 'address': '3fyb44wdhnd2ghhl.onion', 'port': 1234},
-        {'type': 'torv3', 'address': 'vww6ybal4bd7szmgncyruucpgfkqahzddi37ktceo3ah7ngmcopnpyyd.onion', 'port': 9735}
+        {'type': 'torv3', 'address': 'vww6ybal4bd7szmgncyruucpgfkqahzddi37ktceo3ah7ngmcopnpyyd.onion', 'port': 19846}
     ]
 
 
@@ -1042,7 +1042,7 @@ def test_gossip_store_load(node_factory):
                                   "f036515e"  # csum
                                   "5aab817c"  # timestamp
                                   "0101"      # WIRE_NODE_ANNOUNCEMENT
-                                  "cf5d870bc7ecabcb7cd16898ef66891e5f0c6c5851bd85b670f03d325bc44d7544d367cd852e18ec03f7f4ff369b06860a3b12b07b29f36fb318ca11348bf8ec00005aab817c03f113414ebdc6c1fb0f33c99cd5a1d09dd79e7fdf2468cf1fe1af6674361695d23974b250757a7a6c6549544300000000000000000000000000000000000000000000000007010566933e2607"))
+                                  "cf5d870bc7ecabcb7cd16898ef66891e5f0c6c5851bd85b670f03d325bc44d7544d367cd852e18ec03f7f4ff369b06860a3b12b07b29f36fb318ca11348bf8ec00005aab817c03f113414ebdc6c1fb0f33c99cd5a1d09dd79e7fdf2468cf1fe1af6674361695d23974b250757a7a6c6549544300000000000000000000000000000000000000000000000007010566933e4d86"))
 
     l1.start()
     # May preceed the Started msg waited for in 'start'.
@@ -1074,7 +1074,7 @@ def test_gossip_store_load_announce_before_update(node_factory):
                                   "f036515e"  # csum
                                   "5aab817c"  # timestamp
                                   "0101"      # WIRE_NODE_ANNOUNCEMENT
-                                  "cf5d870bc7ecabcb7cd16898ef66891e5f0c6c5851bd85b670f03d325bc44d7544d367cd852e18ec03f7f4ff369b06860a3b12b07b29f36fb318ca11348bf8ec00005aab817c03f113414ebdc6c1fb0f33c99cd5a1d09dd79e7fdf2468cf1fe1af6674361695d23974b250757a7a6c6549544300000000000000000000000000000000000000000000000007010566933e2607"
+                                  "cf5d870bc7ecabcb7cd16898ef66891e5f0c6c5851bd85b670f03d325bc44d7544d367cd852e18ec03f7f4ff369b06860a3b12b07b29f36fb318ca11348bf8ec00005aab817c03f113414ebdc6c1fb0f33c99cd5a1d09dd79e7fdf2468cf1fe1af6674361695d23974b250757a7a6c6549544300000000000000000000000000000000000000000000000007010566933e4d86"
                                   "00000082"  # len
                                   "fd421aeb"  # csum
                                   "5b8d9b44"  # timestamp
@@ -1566,7 +1566,7 @@ def test_gossip_store_load_no_channel_update(node_factory):
                                   "f036515e"  # csum
                                   "5aab817c"  # timestamp
                                   "0101"      # WIRE_NODE_ANNOUNCEMENT
-                                  "cf5d870bc7ecabcb7cd16898ef66891e5f0c6c5851bd85b670f03d325bc44d7544d367cd852e18ec03f7f4ff369b06860a3b12b07b29f36fb318ca11348bf8ec00005aab817c03f113414ebdc6c1fb0f33c99cd5a1d09dd79e7fdf2468cf1fe1af6674361695d23974b250757a7a6c6549544300000000000000000000000000000000000000000000000007010566933e2607"))
+                                  "cf5d870bc7ecabcb7cd16898ef66891e5f0c6c5851bd85b670f03d325bc44d7544d367cd852e18ec03f7f4ff369b06860a3b12b07b29f36fb318ca11348bf8ec00005aab817c03f113414ebdc6c1fb0f33c99cd5a1d09dd79e7fdf2468cf1fe1af6674361695d23974b250757a7a6c6549544300000000000000000000000000000000000000000000000007010566933e4d86"))
 
     l1.start()
 
@@ -1806,7 +1806,7 @@ def test_statictor_onions(node_factory):
     })
 
     assert l1.daemon.is_in_log('127.0.0.1:{}'.format(l1.port))
-    assert l2.daemon.is_in_log('x2y4zvh4fn5q3eouuh7nxnc7zeawrqoutljrup2xjtiyxgx3emgkemad.onion:9735,127.0.0.1:{}'.format(l2.port))
+    assert l2.daemon.is_in_log('x2y4zvh4fn5q3eouuh7nxnc7zeawrqoutljrup2xjtiyxgx3emgkemad.onion:19846,127.0.0.1:{}'.format(l2.port))
 
 
 @pytest.mark.developer("needs a running Tor service instance at port 9151 or 9051")