diff --git a/tests/antithesis/compose.go b/tests/antithesis/compose.go
index 6b2e86417a00..e17e189281bd 100644
--- a/tests/antithesis/compose.go
+++ b/tests/antithesis/compose.go
@@ -237,5 +237,5 @@ func getServiceName(index int) string {
 	if index == 0 {
 		return baseName + "-bootstrap-node"
 	}
-	return fmt.Sprintf("%s-node-%d", baseName, index+1)
+	return fmt.Sprintf("%s-node-%d", baseName, index)
 }
diff --git a/tests/antithesis/node_health.go b/tests/antithesis/node_health.go
index 82bd030f0abb..039442398a73 100644
--- a/tests/antithesis/node_health.go
+++ b/tests/antithesis/node_health.go
@@ -44,7 +44,7 @@ func awaitHealthyNode(ctx context.Context, uri string) error {
 		select {
 		case <-ticker.C:
 		case <-ctx.Done():
-			return fmt.Errorf("node health check cancelled at %s", uri)
+			return fmt.Errorf("node health check cancelled at %s: %w", uri, ctx.Err())
 		}
 	}
 }