diff --git a/internal/retry/retry.go b/internal/retry/retry.go
index e2f26edaf..144011e11 100644
--- a/internal/retry/retry.go
+++ b/internal/retry/retry.go
@@ -69,7 +69,7 @@ func internalRetry(desc string, attempt AttemptFunc, isRetriableError IsRetriabl
 		}
 	}
 
-	return nil, errors.Errorf("unable to complete %v despite %v retries", desc, maxAttempts)
+	return nil, errors.Errorf("unable to complete %v despite %v retries", desc, count)
 }
 
 // WithExponentialBackoffNoValue is a shorthand for WithExponentialBackoff except the
diff --git a/tests/end_to_end_test/server_start_test.go b/tests/end_to_end_test/server_start_test.go
index ff822f260..b06267c44 100644
--- a/tests/end_to_end_test/server_start_test.go
+++ b/tests/end_to_end_test/server_start_test.go
@@ -48,8 +48,6 @@ func (s *serverParameters) ProcessOutput(l string) bool {
 }
 
 func TestServerStart(t *testing.T) {
-	t.Parallel()
-
 	ctx := context.Background()
 
 	e := testenv.NewCLITest(t)
@@ -248,7 +246,7 @@ func verifyServerConnected(t *testing.T, cli *serverapi.Client, want bool) *serv
 func waitForSnapshotCount(t *testing.T, cli *serverapi.Client, match *snapshot.SourceInfo, want int) {
 	t.Helper()
 
-	err := retry.PeriodicallyNoValue(1*time.Second, 30, "wait for snapshots", func() error {
+	err := retry.PeriodicallyNoValue(1*time.Second, 60, "wait for snapshots", func() error {
 		snapshots, err := cli.ListSnapshots(context.Background(), match)
 		if err != nil {
 			return errors.Wrap(err, "error listing sources")