@@ -22,10 +22,11 @@
 #import "OFExceptions.h"
 
 #import "TestsAppDelegate.h"
 
 static OFString *module = @"OFXMLParser";
+static OFXMLParser *parser;
 static int i = 0;
 
 enum event_type {
 	PROCESSING_INSTRUCTIONS,
 	TAG_START,
@@ -60,14 +61,15 @@
 	case 3:
 		TEST(msg, et == TAG_START && [name isEqual: @"root"] &&
 		    prefix == nil && ns == nil && [attrs count] == 0)
 		break;
 	case 4:
-		TEST(msg, et == STRING && [string isEqual: @"\n "])
+		TEST(msg, et == STRING && [string isEqual: @"\n\n "])
 		break;
 	case 5:
-		TEST(msg, et == CDATA && [string isEqual: @"f<]]]oo"])
+		TEST(msg, et == CDATA && [string isEqual: @"f<]]]oo"] &&
+		    [parser lineNumber] == 3)
 		break;
 	case 6:
 		TEST(msg, et == TAG_START && [name isEqual: @"bar"] &&
 		    prefix == nil && ns == nil && attrs == nil)
 		break;
@@ -314,15 +316,14 @@
 }
 
 - (void)XMLParserTests
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
-	OFXMLParser *parser;
 	const char *str = "<?xml version='1.0'?><?p?i?>"
-	    "<!DOCTYPE <<><<>>>><root>\n"
+	    "<!DOCTYPE <<><<>>>><root>\r\r"
 	    " <![CDATA[f<]]]oo]]><bar/>\n"
-	    " <foobar xmlns='urn:objfw:test:foobar'>\n"
+	    " <foobar xmlns='urn:objfw:test:foobar'>\r\n"
 	    "  <qux xmlns:foo='urn:objfw:test:foo'>\n"
 	    "   <foo:bla foo:bla = '&#x62;&#x6c;&#x61;' blafoo='foo'>\n"
 	    "    <blup foo:qux='asd' quxqux='test'/>\n"
 	    "    <bla:bla\r\rxmlns:bla\r=\t\"urn:objfw:test:bla\" qux='qux'\r\n"
 	    "     bla:foo='blafoo'/>\n"
@@ -351,11 +352,12 @@
 		else
 			[parser parseBuffer: str + j
 				   withSize: 2];
 	}
 
-	TEST(@"Checking if everything was parsed", i == 32)
+	TEST(@"Checking if everything was parsed",
+	    i == 32 && [parser lineNumber] == 18)
 
 	TEST(@"-[finishedParsing]", [parser finishedParsing])
 
 	TEST(@"Parsing whitespaces after the document",
 	    R([parser parseString: @" \t\r\n "]))