diff --git a/autotest/XmlCharset/1.xml b/autotest/XmlCharset/1.xml
index 3de7895b4..95bf62ca9 100644
--- a/autotest/XmlCharset/1.xml
+++ b/autotest/XmlCharset/1.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="windows 1250"?>
+<?xml version="1.0" encoding="win 1250"?>
 <test>
 	<tag attr="Nìjaký šikovný attribut">
 		Úplnì nevinný tag
diff --git a/autotest/XmlCharset/XmlCharset.cpp b/autotest/XmlCharset/XmlCharset.cpp
index 1df48858f..f4bc7f322 100644
--- a/autotest/XmlCharset/XmlCharset.cpp
+++ b/autotest/XmlCharset/XmlCharset.cpp
@@ -4,7 +4,16 @@ using namespace Upp;
 
 CONSOLE_APP_MAIN
 {
-	XmlNode xml = ParseXML(LoadFile(GetDataFile("1.xml")));
-	DDUMP(xml["test"]["tag"].GatherText());
-	DDUMP(xml["test"]["tag"].Attr(0));
+	StdLogSetup(LOG_COUT|LOG_FILE);
+
+	for(int i = 0; i < 2; i++) {
+		XmlNode xml = ParseXML(LoadFile(GetDataFile(AsString(i) + ".xml")));
+		DDUMP(TrimBoth(xml["test"]["tag"].GatherText()));
+		DDUMP(xml["test"]["tag"].Attr(0));
+
+		ASSERT(TrimBoth(xml["test"]["tag"].GatherText()) == "Úplně nevinný tag");
+		ASSERT(xml["test"]["tag"].Attr(0) == "Nějaký šikovný attribut");
+	}
+	
+	LOG("============== OK");
 }