diff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh
index 7bd8e06898..6bf84755f3 100755
--- a/t/t1200-tutorial.sh
+++ b/t/t1200-tutorial.sh
@@ -149,7 +149,7 @@ test_expect_success 'git show-branch' '
 
 cat > resolve.expect << EOF
 Updating VARIABLE..VARIABLE
-Fast forward (no commit created; -m option ignored)
+FASTFORWARD (no commit created; -m option ignored)
  example |    1 +
  hello   |    1 +
  2 files changed, 2 insertions(+), 0 deletions(-)
@@ -158,7 +158,8 @@ EOF
 test_expect_success 'git resolve' '
 	git checkout mybranch &&
 	git merge -m "Merge upstream changes." master |
-		sed -e "1s/[0-9a-f]\{7\}/VARIABLE/g" >resolve.output &&
+		sed -e "1s/[0-9a-f]\{7\}/VARIABLE/g" \
+		-e "s/^Fast[- ]forward /FASTFORWARD /" >resolve.output &&
 	test_cmp resolve.expect resolve.output
 '