diff --git a/storagenode/piecestore/endpoint_test.go b/storagenode/piecestore/endpoint_test.go
index e7f1fe6c8..18369d3ba 100644
--- a/storagenode/piecestore/endpoint_test.go
+++ b/storagenode/piecestore/endpoint_test.go
@@ -72,6 +72,8 @@ func TestUploadAndPartialDownload(t *testing.T) {
 			}()
 		}
 
+		require.NoError(t, planet.WaitForStorageNodeEndpoints(ctx))
+
 		var totalBandwidthUsage bandwidth.Usage
 		for _, storagenode := range planet.StorageNodes {
 			usage, err := storagenode.DB.Bandwidth().Summary(ctx, time.Now().Add(-10*time.Hour), time.Now().Add(10*time.Hour))
@@ -191,6 +193,8 @@ func TestUpload(t *testing.T) {
 			}
 		}
 
+		require.NoError(t, planet.WaitForStorageNodeEndpoints(ctx))
+
 		from, to := date.MonthBoundary(time.Now().UTC())
 		summary, err := planet.StorageNodes[0].DB.Bandwidth().SatelliteIngressSummary(ctx, planet.Satellites[0].ID(), from, to)
 		require.NoError(t, err)