diff --git a/cli/src/tests/corpus_test.rs b/cli/src/tests/corpus_test.rs
index bfb2b52c..87df8b28 100644
--- a/cli/src/tests/corpus_test.rs
+++ b/cli/src/tests/corpus_test.rs
@@ -231,10 +231,21 @@ fn test_feature_corpus_files() {
 
             let expected_message = fs::read_to_string(&error_message_path).unwrap();
             if let Err(e) = generate_result {
-                if e.to_string() != expected_message {
+                let actual_message = e.to_string();
+                let first_diff = expected_message
+                    .lines()
+                    .zip(actual_message.lines())
+                    .enumerate()
+                    .filter(|(_, (expected, actual))| expected != actual)
+                    .next();
+                if let Some((line_number,(expected_line, actual_line))) = first_diff {
                     eprintln!(
                         "Unexpected error message.\n\nExpected:\n\n{}\nActual:\n\n{}\n",
-                        expected_message, e
+                        expected_message, actual_message
+                    );
+                    eprintln!(
+                        "First difference on line {}; expected:\n{}\nActual:\n{}\n",
+                        line_number, expected_line, actual_line
                     );
                     failure_count += 1;
                 }
diff --git a/test/fixtures/test_grammars/external_and_internal_tokens/scanner.c b/test/fixtures/test_grammars/external_and_internal_tokens/scanner.c
index 837a1d1a..43a4bc9d 100644
--- a/test/fixtures/test_grammars/external_and_internal_tokens/scanner.c
+++ b/test/fixtures/test_grammars/external_and_internal_tokens/scanner.c
@@ -35,7 +35,7 @@ bool tree_sitter_external_and_internal_tokens_external_scanner_scan(
 ) {
   // If a line-break is a valid lookahead token, only skip spaces.
   if (whitelist[LINE_BREAK]) {
-    while (lexer->lookahead == ' ') {
+    while (lexer->lookahead == ' ' || lexer->lookahead == '\r') {
       lexer->advance(lexer, true);
     }
 
@@ -49,7 +49,7 @@ bool tree_sitter_external_and_internal_tokens_external_scanner_scan(
   // If a line-break is not a valid lookahead token, skip line breaks as well
   // as spaces.
   if (whitelist[STRING]) {
-    while (lexer->lookahead == ' ' || lexer->lookahead == '\n') {
+    while (lexer->lookahead == ' ' || lexer->lookahead == '\r' || lexer->lookahead == '\n') {
       lexer->advance(lexer, true);
     }
 
diff --git a/test/fixtures/test_grammars/external_tokens/scanner.c b/test/fixtures/test_grammars/external_tokens/scanner.c
index 3fea84b3..c187f41b 100644
--- a/test/fixtures/test_grammars/external_tokens/scanner.c
+++ b/test/fixtures/test_grammars/external_tokens/scanner.c
@@ -46,7 +46,8 @@ bool tree_sitter_external_tokens_external_scanner_scan(
   if (whitelist[percent_string]) {
     while (lexer->lookahead == ' ' ||
            lexer->lookahead == '\t' ||
-           lexer->lookahead == '\n') {
+           lexer->lookahead == '\n' ||
+           lexer->lookahead == '\r') {
       lexer->advance(lexer, true);
     }
 
diff --git a/test/fixtures/test_grammars/inverted_external_token/scanner.c b/test/fixtures/test_grammars/inverted_external_token/scanner.c
index c2cd6ce9..260994c5 100644
--- a/test/fixtures/test_grammars/inverted_external_token/scanner.c
+++ b/test/fixtures/test_grammars/inverted_external_token/scanner.c
@@ -23,7 +23,7 @@ void tree_sitter_inverted_external_token_external_scanner_deserialize(
 
 bool tree_sitter_inverted_external_token_external_scanner_scan(
   void *payload, TSLexer *lexer, const bool *whitelist) {
-  while (lexer->lookahead == ' ') {
+  while (lexer->lookahead == ' ' || lexer->lookahead == '\r') {
     lexer->advance(lexer, true);
   }
 
@@ -34,7 +34,7 @@ bool tree_sitter_inverted_external_token_external_scanner_scan(
     lexer->mark_end(lexer);
 
     // Skip whitespace *after* having marked the end.
-    while (lexer->lookahead == ' ' || lexer->lookahead == '\n') {
+    while (lexer->lookahead == ' ' || lexer->lookahead == '\n' || lexer->lookahead == '\r') {
       lexer->advance(lexer, true);
     }