diff --git a/testing/resources/pixel/bug_1236805.in b/testing/resources/pixel/bug_1236805.in
index 564f048..ea2fc48 100644
--- a/testing/resources/pixel/bug_1236805.in
+++ b/testing/resources/pixel/bug_1236805.in
@@ -78,6 +78,7 @@
 ID
 EI
 Q
+
 endstream
 endobj
 {{xref}}
diff --git a/testing/resources/pixel/bug_1395648.in b/testing/resources/pixel/bug_1395648.in
index 6c38fb1..828e84c 100644
--- a/testing/resources/pixel/bug_1395648.in
+++ b/testing/resources/pixel/bug_1395648.in
@@ -59,6 +59,7 @@
 >>
 stream
 789cabaa1a05a3808e4061148c027a028351300ae809246c128a027e0020065c9c90d
+
 endstream
 endobj
 {{xref}}
diff --git a/testing/tools/fixup_pdf_template.py b/testing/tools/fixup_pdf_template.py
index 1d38117..06ed3c1 100755
--- a/testing/tools/fixup_pdf_template.py
+++ b/testing/tools/fixup_pdf_template.py
@@ -109,6 +109,9 @@
     if self.streamlen_state == StreamLenState.FIND_ENDSTREAM:
       if line.rstrip() == b'endstream':
         self.streamlen_state = StreamLenState.START
+        # Don't count final newline.
+        # insert_includes() already stripped windows line endings.
+        self.streamlens[-1] -= 1
       else:
         self.streamlens[-1] += len(line)