diff --git a/runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/IntegerList/IntegerList.txt b/runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/IntegerList/IntegerList.txt
index 20ad866e6d..afee3c84dd 100644
--- a/runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/IntegerList/IntegerList.txt
+++ b/runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/IntegerList/IntegerList.txt
@@ -76,4 +76,4 @@ unicodeBMPIntegerListToCharArray();
 unicodeSMPIntegerListToCharArray();
 
 [skip]
-CSharp Java Cpp Dart Go JavaScript Php Python2 Python3 Swift
\ No newline at end of file
+CSharp Cpp Dart Go JavaScript PHP Python2 Python3 Swift
\ No newline at end of file
diff --git a/runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/LexerExec/BufferedTokenStreamReuseAfterFill.txt b/runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/LexerExec/BufferedTokenStreamReuseAfterFill.txt
index 3f584cd11e..ca50aff527 100644
--- a/runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/LexerExec/BufferedTokenStreamReuseAfterFill.txt
+++ b/runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/LexerExec/BufferedTokenStreamReuseAfterFill.txt
@@ -32,3 +32,6 @@ assert Token.EOF == tokenStream.get(2).getType();
 [output]
 [@0,0:0='A',<1>,1:0]
 [@1,1:0='<EOF>',<-1>,1:1]
+
+[skip]
+CSharp Cpp Dart Go JavaScript PHP Python2 Python3 Swift
\ No newline at end of file
diff --git a/runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/Visitors/CalculatorVisitor.txt b/runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/Visitors/CalculatorVisitor.txt
index 0e29a71155..782ed92e59 100644
--- a/runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/Visitors/CalculatorVisitor.txt
+++ b/runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/Visitors/CalculatorVisitor.txt
@@ -86,4 +86,4 @@ outStream.print(new Calculator().visit(tree));
 6
 
 [skip]
-CSharp Java Cpp Dart Go JavaScript Php Python2 Python3 Swift
+CSharp Cpp Dart Go JavaScript PHP Python2 Python3 Swift
diff --git a/runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/Visitors/ErrorNode.txt b/runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/Visitors/ErrorNode.txt
index b0f6e0d182..20e118673f 100644
--- a/runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/Visitors/ErrorNode.txt
+++ b/runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/Visitors/ErrorNode.txt
@@ -44,3 +44,6 @@ outStream.print(new VisitorBasicStringBaseVisitor().visit(tree));
 
 [output]
 Error encountered: [@-1,-1:-1='<missing 'A'>',<1>,1:0]
+
+[skip]
+CSharp Cpp Dart Go JavaScript PHP Python2 Python3 Swift
\ No newline at end of file
diff --git a/runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/Visitors/ShouldNotVisitEOF.txt b/runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/Visitors/ShouldNotVisitEOF.txt
index 26a2eca89b..3421d7caaf 100644
--- a/runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/Visitors/ShouldNotVisitEOF.txt
+++ b/runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/Visitors/ShouldNotVisitEOF.txt
@@ -40,3 +40,6 @@ outStream.print(new VisitorBasicStringBaseVisitor().visit(tree));
 [output]
 """[@0,0:0='A',<1>,1:0]
 """
+
+[skip]
+CSharp Cpp Dart Go JavaScript PHP Python2 Python3 Swift
diff --git a/runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/Visitors/ShouldNotVisitTerminal.txt b/runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/Visitors/ShouldNotVisitTerminal.txt
index 22df72acac..4e5b1abf72 100644
--- a/runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/Visitors/ShouldNotVisitTerminal.txt
+++ b/runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/Visitors/ShouldNotVisitTerminal.txt
@@ -45,3 +45,6 @@ outStream.print(new VisitorBasicStringBaseVisitor().visit(tree));
 
 [output]
 default result
+
+[skip]
+CSharp Cpp Dart Go JavaScript PHP Python2 Python3 Swift
diff --git a/runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/Visitors/TerminalNode.txt b/runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/Visitors/TerminalNode.txt
index ad57fae1b1..23cab0a07b 100644
--- a/runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/Visitors/TerminalNode.txt
+++ b/runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/Visitors/TerminalNode.txt
@@ -84,4 +84,4 @@ TEST_platformStdoutWrite(VisitorBasicStringBaseVisitor().visit(tree));
 [@1,1:0='<EOF>',<-1>,1:1]
 
 [skip]
-CSharp Java Cpp Dart Go JavaScript Php Python2 Python3 Swift
\ No newline at end of file
+CSharp Cpp Dart Go JavaScript PHP Python2 Python3 Swift
\ No newline at end of file
diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/RuntimeTestDescriptorParser.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/RuntimeTestDescriptorParser.java
index 5b3aefb727..cfcbef8fb7 100644
--- a/runtime-testsuite/test/org/antlr/v4/test/runtime/RuntimeTestDescriptorParser.java
+++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/RuntimeTestDescriptorParser.java
@@ -166,7 +166,7 @@ else if ( value.indexOf('\n')>=0 ) {
 					}
 					continue;
 				case "skip":
-					skipTargets = value.split("\n");
+					skipTargets = value.split("\\s");
 					continue;
 				case "codeDeclaration":
 					isCodeDeclaration = true;