diff --git a/p2p/discover/v5_udp_test.go b/p2p/discover/v5_udp_test.go
index 6abe20d7a4..fec4d98991 100644
--- a/p2p/discover/v5_udp_test.go
+++ b/p2p/discover/v5_udp_test.go
@@ -49,6 +49,11 @@ func TestUDPv5_lookupE2E(t *testing.T) {
 		var cfg Config
 		if len(nodes) > 0 {
 			bn := nodes[0].Self()
+			// Wait for bootnode to have a valid UDP port (fix for flaky test)
+			for j := 0; j < 50 && bn.UDP() == 0; j++ {
+				time.Sleep(10 * time.Millisecond)
+				bn = nodes[0].Self()
+			}
 			cfg.Bootnodes = []*enode.Node{bn}
 		}
 		node := startLocalhostV5(t, cfg)