diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/MisleadingEscapedSpace.java b/core/src/main/java/com/google/errorprone/bugpatterns/MisleadingEscapedSpace.java
index 13541bdbc54..0bbc0387c47 100644
--- a/core/src/main/java/com/google/errorprone/bugpatterns/MisleadingEscapedSpace.java
+++ b/core/src/main/java/com/google/errorprone/bugpatterns/MisleadingEscapedSpace.java
@@ -67,6 +67,7 @@ public Description matchLiteral(LiteralTree tree, VisitorState state) {
         for (int i = 0; i < literal.length(); ++i) {
           switch (literal.charAt(i)) {
             case '\n':
+            case '\r':
               seenEscape = false;
               break;
             case '\\':
diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/MisleadingEscapedSpaceTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/MisleadingEscapedSpaceTest.java
index ebf611a2911..4c4e9c5e19e 100644
--- a/core/src/test/java/com/google/errorprone/bugpatterns/MisleadingEscapedSpaceTest.java
+++ b/core/src/test/java/com/google/errorprone/bugpatterns/MisleadingEscapedSpaceTest.java
@@ -17,152 +17,143 @@
 package com.google.errorprone.bugpatterns;
 
 import com.google.errorprone.CompilationTestHelper;
+import com.google.testing.junit.testparameterinjector.TestParameter;
+import com.google.testing.junit.testparameterinjector.TestParameterInjector;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 
-@RunWith(JUnit4.class)
+@RunWith(TestParameterInjector.class)
 public final class MisleadingEscapedSpaceTest {
   private final CompilationTestHelper testHelper =
       CompilationTestHelper.newInstance(MisleadingEscapedSpace.class, getClass());
 
+  private enum LineSeparator {
+    CRLF("\r\n"),
+    LF("\n");
+
+    final String separator;
+
+    LineSeparator(String separator) {
+      this.separator = separator;
+    }
+  }
+
+  @TestParameter private LineSeparator lineSeparator;
+
+  private void test(String text) {
+    testHelper.addSourceLines("Test.class", text.replace("\n", lineSeparator.separator)).doTest();
+  }
+
   @Test
   public void misleadingEscape() {
-    testHelper
-        .addSourceLines(
-            "Test.class",
-            """
-            class Test {
-              // BUG: Diagnostic contains:
-              private static final String FOO = " \\s ";
-            }
-            """)
-        .doTest();
+    test(
+        """
+        class Test {
+          // BUG: Diagnostic contains:
+          private static final String FOO = " \\s ";
+        }
+        """);
   }
 
   @Test
   public void literalBackslashS() {
-    testHelper
-        .addSourceLines(
-            "Test.class",
-            """
-            class Test {
-              private static final String FOO = " \\\\s ";
-            }
-            """)
-        .doTest();
+    test(
+        """
+        class Test {
+          private static final String FOO = " \\\\s ";
+        }
+        """);
   }
 
   @Test
   public void asSingleCharacter_misleading() {
-    testHelper
-        .addSourceLines(
-            "Test.class",
-            """
-            class Test {
-              // BUG: Diagnostic contains:
-              private static final char x = '\\s';
-            }
-            """)
-        .doTest();
+    test(
+        """
+        class Test {
+          // BUG: Diagnostic contains:
+          private static final char x = '\\s';
+        }
+        """);
   }
 
   @Test
   public void withinTextBlock_notAtEndOfLine_misleading() {
-    testHelper
-        .addSourceLines(
-            "Test.class",
-            """
-            class Test {
-              private static final String FOO =
-                  // BUG: Diagnostic contains:
-                  \"""
-              foo   \\s  bar
-              \""";
-              private static final String BAZ =
-                  // BUG: Diagnostic contains:
-                  \"""
-              foo   \\s
-              bar  \\s baz
-              \""";
-            }
-            """)
-        .doTest();
+    test(
+        """
+        class Test {
+          private static final String FOO =
+              // BUG: Diagnostic contains:
+              \"""
+          foo   \\s  bar
+          \""";
+          private static final String BAZ =
+              // BUG: Diagnostic contains:
+              \"""
+          foo   \\s
+          bar  \\s baz
+          \""";
+        }
+        """);
   }
 
   @Test
   public void atEndOfLine_notMisleading() {
-    testHelper
-        .addSourceLines(
-            "Test.class",
-            """
-            class Test {
-              private static final String FOO =
-                  \"""
-              foo   \\s
-              bar     \\s
-              \""";
-            }
-            """)
-        .doTest();
+    test(
+        """
+        class Test {
+          private static final String FOO =
+              \"""
+          foo   \\s
+          bar     \\s
+          \""";
+        }
+        """);
   }
 
   @Test
   public void multipleAtEndOfLine_notMisleading() {
-    testHelper
-        .addSourceLines(
-            "Test.class",
-            """
-            class Test {
-              private static final String FOO =
-                  \"""
-              foo   \\s\\s\\s\\s
-              \""";
-            }
-            """)
-        .doTest();
+    test(
+        """
+        class Test {
+          private static final String FOO =
+              \"""
+          foo   \\s\\s\\s\\s
+          \""";
+        }
+        """);
   }
 
   @Test
   public void withinCommentInBrokenUpString_noFinding() {
-    testHelper
-        .addSourceLines(
-            "Test.class",
-            """
-            class Test {
-              private static final String FOO = "foo" + /* \\s */ " bar";
-            }
-            """)
-        .doTest();
+    test(
+        """
+        class Test {
+          private static final String FOO = "foo" + /* \\s */ " bar";
+        }
+        """);
   }
 
   @Test
   public void atEndOfString_noFinding() {
-    testHelper
-        .addSourceLines(
-            "Test.class",
-            """
-            class Test {
-              private static final String FOO =
-                  \"""
-              foo
-              bar\\s\""";
-            }
-            """)
-        .doTest();
+    test(
+        """
+        class Test {
+          private static final String FOO =
+              \"""
+          foo
+          bar\\s\""";
+        }
+        """);
   }
 
   @Test
   public void escapedSpaceAtEndOfString() {
-    testHelper
-        .addSourceLines(
-            "Test.class",
-            """
-            class Test {
-              // BUG: Diagnostic contains:
-              private static final String FOO = "foo\\s";
-            }
-            """)
-        .doTest();
+    test(
+        """
+        class Test {
+          // BUG: Diagnostic contains:
+          private static final String FOO = "foo\\s";
+        }
+        """);
   }
 }