diff --git a/.gitattributes b/.gitattributes
index 0e32fd4c36d..c60160ec0d6 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -12,9 +12,6 @@ changelog_checker text eol=lf
 *.cmd text eol=crlf
 shell/autogen text eol=lf
 
-# For diffing simplicity, the patch re-write test uses LF endings on Windows
-tests/patcher-test.reference text eol=lf
-
 # Don't normalise patch files
 *.patch -text
 
diff --git a/tests/dune b/tests/lib/dune
similarity index 100%
rename from tests/dune
rename to tests/lib/dune
diff --git a/tests/patcher.expected b/tests/lib/patcher.expected
similarity index 100%
rename from tests/patcher.expected
rename to tests/lib/patcher.expected
diff --git a/tests/patcher.ml b/tests/lib/patcher.ml
similarity index 100%
rename from tests/patcher.ml
rename to tests/lib/patcher.ml