diff --git a/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/LexerExec/CharSet.stg b/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/LexerExec/CharSet.stg
index aec516e99..dc0b80cf3 100644
--- a/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/LexerExec/CharSet.stg
+++ b/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/LexerExec/CharSet.stg
@@ -1,21 +1,17 @@
 TestType() ::= "Lexer"
 
-Options ::= [
-	"Ignore": "Currently unable to generate the required CRLF input sequence."
-]
-
 Grammar ::= [
 	"L": {<grammar("L")>}
 ]
 
-Input() ::= "34<\u000D><\n> 34"
+Input() ::= "34<\n> 34"
 
 Output() ::= <<
 I
 I
 [@0,0:1='34',\<1>,1:0]
-[@1,5:6='34',\<1>,2:1]
-[@2,7:6='\<EOF>',\<-1>,2:3]<\n>
+[@1,4:5='34',\<1>,2:1]
+[@2,6:5='\<EOF>',\<-1>,2:3]<\n>
 >>
 
 Errors() ::= ""
diff --git a/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/LexerExec/CharSetPlus.stg b/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/LexerExec/CharSetPlus.stg
index 907019311..c4fc9a80a 100644
--- a/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/LexerExec/CharSetPlus.stg
+++ b/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/LexerExec/CharSetPlus.stg
@@ -1,21 +1,17 @@
 TestType() ::= "Lexer"
 
-Options ::= [
-	"Ignore": "Currently unable to generate the required CRLF input sequence."
-]
-
 Grammar ::= [
 	"L": {<grammar("L")>}
 ]
 
-Input() ::= "34<\u000D><\n> 34"
+Input() ::= "34<\n> 34"
 
 Output() ::= <<
 I
 I
 [@0,0:1='34',\<1>,1:0]
-[@1,5:6='34',\<1>,2:1]
-[@2,7:6='\<EOF>',\<-1>,2:3]<\n>
+[@1,4:5='34',\<1>,2:1]
+[@2,6:5='\<EOF>',\<-1>,2:3]<\n>
 >>
 
 Errors() ::= ""
diff --git a/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/LexerExec/CharSetRange.stg b/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/LexerExec/CharSetRange.stg
index a68e8c86b..b5a724921 100644
--- a/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/LexerExec/CharSetRange.stg
+++ b/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/LexerExec/CharSetRange.stg
@@ -1,14 +1,10 @@
 TestType() ::= "Lexer"
 
-Options ::= [
-	"Ignore": "Currently unable to generate the required CRLF input sequence."
-]
-
 Grammar ::= [
 	"L": {<grammar("L")>}
 ]
 
-Input() ::= "34<\u000D> 34 a2 abc <\n>   "
+Input() ::= "34<\n> 34 a2 abc <\n>   "
 
 Output() ::= <<
 I
@@ -16,10 +12,10 @@ I
 ID
 ID
 [@0,0:1='34',\<1>,1:0]
-[@1,4:5='34',\<1>,1:4]
-[@2,7:8='a2',\<2>,1:7]
-[@3,10:12='abc',\<2>,1:10]
-[@4,18:17='\<EOF>',\<-1>,2:3]<\n>
+[@1,4:5='34',\<1>,2:1]
+[@2,7:8='a2',\<2>,2:4]
+[@3,10:12='abc',\<2>,2:7]
+[@4,18:17='\<EOF>',\<-1>,3:3]<\n>
 >>
 
 Errors() ::= ""
diff --git a/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/LexerExec/CharSetWithMissingEndRange.stg b/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/LexerExec/CharSetWithMissingEndRange.stg
index 1cceb6ba2..3e094898c 100644
--- a/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/LexerExec/CharSetWithMissingEndRange.stg
+++ b/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/LexerExec/CharSetWithMissingEndRange.stg
@@ -1,19 +1,15 @@
 TestType() ::= "Lexer"
 
-Options ::= [
-	"Ignore": "Currently unable to generate the required CRLF input sequence."
-]
-
 Grammar ::= [
 	"L": {<grammar("L")>}
 ]
 
-Input() ::= "00<\u000D><\n>"
+Input() ::= "00<\n>"
 
 Output() ::= <<
 I
 [@0,0:1='00',\<1>,1:0]
-[@1,4:3='\<EOF>',\<-1>,2:0]<\n>
+[@1,3:2='\<EOF>',\<-1>,2:0]<\n>
 >>
 
 Errors() ::= ""