diff --git a/.gitattributes b/.gitattributes
index b64bbed2eb45b..eaf7f7f9a1910 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,38 @@
 *.pnm -diff -text
-Changelog    merge=union
+Changelog merge=union
+tests/ref/fate/sub-aqtitle eol=lf
+tests/ref/fate/sub-ass-to-ass-transcode eol=lf
+tests/ref/fate/sub-cc eol=lf
+tests/ref/fate/sub-cc-realtime
+tests/ref/fate/sub-cc-realtime eol=lf
+tests/ref/fate/sub-cc-scte20 eol=lf
+tests/ref/fate/sub-charenc eol=lf
+tests/ref/fate/sub-dvb eol=lf
+tests/ref/fate/sub-jacosub eol=lf
+tests/ref/fate/sub-lrc-remux eol=lf
+tests/ref/fate/sub-microdvd eol=lf
+tests/ref/fate/sub-microdvd-remux eol=lf
+tests/ref/fate/sub-movtext eol=lf
+tests/ref/fate/sub-mpl2 eol=lf
+tests/ref/fate/sub-mpsub eol=lf
+tests/ref/fate/sub-mpsub-frames eol=lf
+tests/ref/fate/sub-pgs-remux eol=lf
+tests/ref/fate/sub-pjs eol=lf
+tests/ref/fate/sub-realtext eol=lf
+tests/ref/fate/sub-sami eol=lf
+tests/ref/fate/sub-sami2 eol=lf
+tests/ref/fate/sub-scc-remux eol=lf
+tests/ref/fate/sub-srt eol=lf
+tests/ref/fate/sub-srt-badsyntax eol=lf
+tests/ref/fate/sub-srt-empty-events eol=lf
+tests/ref/fate/sub-srt-madness-timeshift eol=lf
+tests/ref/fate/sub-srt-rrn-remux eol=lf
+tests/ref/fate/sub-ssa-to-ass-remux eol=lf
+tests/ref/fate/sub-stl eol=lf
+tests/ref/fate/sub-subviewer eol=lf
+tests/ref/fate/sub-subviewer1 eol=lf
+tests/ref/fate/sub-ttmlenc eol=lf
+tests/ref/fate/sub-vplayer eol=lf
+tests/ref/fate/sub-webvtt eol=lf
+tests/ref/fate/sub-webvtt2 eol=lf
+tests/ref/fate/sub-webvttenc eol=lf
diff --git a/tests/fate/hevc.mak b/tests/fate/hevc.mak
index e432345ef73be..dee34e940daad 100644
--- a/tests/fate/hevc.mak
+++ b/tests/fate/hevc.mak
@@ -283,7 +283,7 @@ $(TARGET_SAMPLES)/hevc-conformance/LS_A_Orange_2.bit|$\
 $(TARGET_SAMPLES)/hevc/mv_nuh_layer_id.bit|$\
 $(TARGET_SAMPLES)/hevc-conformance/NoOutPrior_B_Qualcomm_1.bit|$\
 $(TARGET_SAMPLES)/hevc-conformance/MVHEVCS_A.bit
-fate-hevc-mv-switch: CMD = framecrc -i "concat:$(INPUT)" -fps_mode passthrough -map 0:vidx:0 -map 0:vidx:1 -sws_flags +accurate_rnd+bitexact
+fate-hevc-mv-switch: CMD = MSYS2_ARG_CONV_EXCL=concat: framecrc -i "concat:$(INPUT)" -fps_mode passthrough -map 0:vidx:0 -map 0:vidx:1 -sws_flags +accurate_rnd+bitexact
 FATE_HEVC-$(call FRAMECRC, HEVC, HEVC, SCALE_FILTER CONCAT_PROTOCOL) += fate-hevc-mv-switch
 
 # multiview stream, select view by position
diff --git a/tests/fate/source-check.sh b/tests/fate/source-check.sh
index 4d7e175784141..99e869e869f62 100755
--- a/tests/fate/source-check.sh
+++ b/tests/fate/source-check.sh
@@ -28,7 +28,7 @@ for f in `git ls-files | grep '\.h$'` ; do
         -e 's/_vaf_/_/' \
     | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
 
-    git grep -L "^#define $macro$" $f
+    git grep -L "^#define $macro\>" $f
 done
 
 echo "Use of av_clip() where av_clip_uintp2() could be used:"