diff --git a/t/t6031-merge-recursive.sh b/t/t6031-merge-recursive.sh
index 8073e0c3ef..02aafa6d56 100755
--- a/t/t6031-merge-recursive.sh
+++ b/t/t6031-merge-recursive.sh
@@ -20,7 +20,7 @@ test_expect_success 'mode change in one branch: keep changed version' '
 	git commit -m b1 &&
 	git checkout a1 &&
 	git merge-recursive master -- a1 b1 &&
-	test -x file1
+	{ test -x file1 || git ls-files -s file1 | grep ^100755; }
 '
 
 test_expect_success 'mode change in both branches: expect conflict' '
@@ -46,7 +46,7 @@ test_expect_success 'mode change in both branches: expect conflict' '
 		echo "100644 $H 3	file2"
 	) >expect &&
 	test_cmp actual expect &&
-	test -x file2
+	{ test -x file2 || git ls-files -s file2 | grep ^100755; }
 '
 
 test_done