diff --git a/esti/golden/lakectl_log_no_merges.golden b/esti/golden/lakectl_log_no_merges.golden
index 41d005b8cf9..c84505301a3 100644
--- a/esti/golden/lakectl_log_no_merges.golden
+++ b/esti/golden/lakectl_log_no_merges.golden
@@ -1,11 +1,18 @@
+
 ID:            <COMMIT_ID>
 Author:        esti
 Date:          <DATE> <TIME> <TZ>
-    ${MESSAGE}
+
+    ${SECOND_MESSAGE}
+    
 ID:            <COMMIT_ID>
 Author:        esti
 Date:          <DATE> <TIME> <TZ>
+
     ${MESSAGE}
+    
 ID:            <COMMIT_ID>
 Date:          <DATE> <TIME> <TZ>
-    Repository created
\ No newline at end of file
+
+    Repository created
+
diff --git a/esti/lakectl_test.go b/esti/lakectl_test.go
index 8db7747d819..a1a263b25b7 100644
--- a/esti/lakectl_test.go
+++ b/esti/lakectl_test.go
@@ -378,6 +378,7 @@ func TestLakectlLogNoMergesWithCommitsAndMerges(t *testing.T) {
 	RunCmdAndVerifySuccessWithFile(t, Lakectl()+" fs upload -s files/ro_1k lakefs://"+repoName+"/"+featureBranch+"/"+filePath2, false, "lakectl_fs_upload", branchVars)
 	commitMessage = "second commit to feature branch"
 	branchVars["MESSAGE"] = commitMessage
+	vars["SECOND_MESSAGE"] = commitMessage
 	RunCmdAndVerifySuccessWithFile(t, Lakectl()+" commit lakefs://"+repoName+"/"+featureBranch+" -m \""+commitMessage+"\"", false, "lakectl_commit", branchVars)
 
 	// merge feature into main