diff --git a/upptst/XmlTag/XmlTag.cpp b/upptst/XmlTag/XmlTag.cpp
new file mode 100644
index 000000000..ab2756c2f
--- /dev/null
+++ b/upptst/XmlTag/XmlTag.cpp
@@ -0,0 +1,40 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+#define XML(x) LOG(#x << " ------------\n" << x << "-------\n\n")
+
+CONSOLE_APP_MAIN
+{
+//	String h = XmlTag("test").Text("ahoj\nkamarade\n");
+//	LOG(h);
+//	LOG("=============");
+//	LOG(XmlTag("hhh")(h));
+	
+	XML(XmlTag("a")(XmlTag("b")()));
+	XML(XmlTag("a")(XmlTag("b").Text("text")));
+	XML(XmlTag("simple")("text"));
+	XML(XmlTag("tag2").Text("text"));
+	XML(XmlTag("tag2").Text("text\n"));
+	XML(XmlTag("tag")(XmlTag("tag2").Text("text")));
+	XML(XmlTag("tag")(XmlTag("tag2").Text("text\n")));
+	XML(XmlTag("tag3")(XmlTag("tag")(XmlTag("tag2").Text("text"))));
+	XML(XmlTag("tag3")(XmlTag("tag")(XmlTag("tag2").Text("text\n"))));
+	XML(XmlTag("tag3")(XmlTag("tag")(XmlTag("tag2").Text("text\n"))));
+	XML(XmlTag("tag3")(XmlTag("tag")(XmlTag("tag2").Text("text\ntext"))));
+	XML(XmlTag("tag3")(XmlTag("tag")(XmlTag("tag2").Text("text\ntext\n"))));
+	XML(XmlTag("methodCall")(XmlTag("methodName")("METHOD") +
+	                         XmlTag("params")(
+	                         	XmlTag("param")(
+	                         		XmlTag("int")("123")))));
+	XML(XmlTag("param")(XmlTag("int")("123")));
+	XML(XmlTag("params")(XmlTag("param")(XmlTag("int")("123"))));
+//	XML(XmlTag("tag2")(XmlTag("tag")("attrib","bad\n<value").Text("text")));4
+	
+	return;
+	String h = XmlTag("int")("123");
+	LOG(h);
+	DUMPHEX(h);
+	h = XmlTag("param")(h);
+	LOG(h);
+}
diff --git a/upptst/XmlTag/XmlTag.upp b/upptst/XmlTag/XmlTag.upp
new file mode 100644
index 000000000..d4c142ccb
--- /dev/null
+++ b/upptst/XmlTag/XmlTag.upp
@@ -0,0 +1,9 @@
+uses
+	Core;
+
+file
+	XmlTag.cpp;
+
+mainconfig
+	"" = "SSE2";
+
diff --git a/upptst/XmlTag/init b/upptst/XmlTag/init
new file mode 100644
index 000000000..294c3f05e
--- /dev/null
+++ b/upptst/XmlTag/init
@@ -0,0 +1,4 @@
+#ifndef _XmlTag_icpp_init_stub
+#define _XmlTag_icpp_init_stub
+#include "Core/init"
+#endif