diff --git a/.gitattributes b/.gitattributes
index 52a184ba2d..24d63fe05d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -13,3 +13,5 @@ lib/V8/v8-json.cpp merge=ours
 arangod/Aql/tokens.cpp merge=ours
 arangod/Aql/grammar.cpp merge=ours
 js/apps/system/_admin/aardvark/APP/api-docs.json merge=ours
+tests/* linguist-vendored
+3rdParty/* linguist-vendored