@@ -45,14 +45,15 @@
 static of_unichar_t sucstr[] = {
 	0xFFFE0000, 0x66000000, 0xF6000000, 0xF6000000, 0x62000000, 0xE4000000,
 	0x72000000, 0x3AF00100
 };
 static uint16_t utf16str[] = {
-	0xFEFF, 'f', 0xF6, 0xF6, 'b', 0xE4, 'r', 0xD83C, 0xDC3A
+	0xFEFF, 'f', 0xF6, 0xF6, 'b', 0xE4, 'r', 0xD83C, 0xDC3A, 0
 };
 static uint16_t sutf16str[] = {
-	0xFFFE, 0x6600, 0xF600, 0xF600, 0x6200, 0xE400, 0x7200, 0x3CD8, 0x3ADC
+	0xFFFE, 0x6600, 0xF600, 0xF600, 0x6200, 0xE400, 0x7200, 0x3CD8, 0x3ADC,
+	0
 };
 
 @interface EntityHandler: OFObject <OFStringXMLUnescapingDelegate>
 @end
 
@@ -164,18 +165,14 @@
 	    (is = [OFString stringWithCharacters: sucstr
 					  length: sizeof(sucstr) /
 						  sizeof(*sucstr)]) &&
 	    [is isEqual: @"fööbär🀺"])
 
-	TEST(@"+[stringWithUTF16String:length:]",
-	    (is = [OFString stringWithUTF16String: utf16str
-					   length: sizeof(utf16str) /
-						   sizeof(*utf16str)]) &&
+	TEST(@"+[stringWithUTF16String:]",
+	    (is = [OFString stringWithUTF16String: utf16str]) &&
 	    [is isEqual: @"fööbär🀺"] &&
-	    (is = [OFString stringWithUTF16String: sutf16str
-					   length: sizeof(sutf16str) /
-						   sizeof(*sutf16str)]) &&
+	    (is = [OFString stringWithUTF16String: sutf16str]) &&
 	    [is isEqual: @"fööbär🀺"])
 
 	TEST(@"+[stringWithContentsOfFile:encoding]", (is = [OFString
 	    stringWithContentsOfFile: @"testfile.txt"
 			    encoding: OF_STRING_ENCODING_ISO_8859_1]) &&