diff --git a/tests/include/TextTest.php b/tests/include/TextTest.php
index ac1b7d7757..1422ee2ae2 100644
--- a/tests/include/TextTest.php
+++ b/tests/include/TextTest.php
@@ -249,45 +249,6 @@ class TextTest extends TestCase
 		);
 	}
 
-	/**
-	 *xmlify and unxmlify
-	 */
-	public function testXmlify()
-	{
-		$text="<tag>I want to break\n this!11!<?hard?></tag>";
-		$xml=xmlify($text);
-		$retext=unxmlify($text);
-
-		$this->assertEquals($text, $retext);
-	}
-
-	/**
-	 * xmlify and put in a document
-	 */
-	public function testXmlifyDocument()
-	{
-		$tag="<tag>I want to break</tag>";
-		$xml=xmlify($tag);
-		$text='<text>'.$xml.'</text>';
-
-		$xml_parser=xml_parser_create();
-		//should be possible to parse it
-		$values=array();
-		$index=array();
-		$this->assertEquals(1, xml_parse_into_struct($xml_parser, $text, $values, $index));
-
-		$this->assertEquals(
-			array('TEXT'=>array(0)),
-			$index
-		);
-		$this->assertEquals(
-			array(array('tag'=>'TEXT', 'type'=>'complete', 'level'=>1, 'value'=>$tag)),
-			$values
-		);
-
-		xml_parser_free($xml_parser);
-	}
-
 	/**
 	 * test hex2bin and reverse
 	 */
diff --git a/tests/src/Util/StringsTest.php b/tests/src/Util/StringsTest.php
new file mode 100644
index 0000000000..eb5e707a70
--- /dev/null
+++ b/tests/src/Util/StringsTest.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * @file tests/src/Util/StringsTest.php
+ */
+namespace Friendica\Test\Util;
+
+use Friendica\Util\Strings;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @brief Strings utility test class
+ */
+class StringsTest extends TestCase
+{
+    /**
+	* escape and unescape
+	*/
+	public function testEscapeUnescape()
+	{
+		$text="<tag>I want to break\n this!11!<?hard?></tag>";
+		$xml=XML::escape($text);
+		$retext=XML::unescape($text);
+		$this->assertEquals($text, $retext);
+    }
+    
+	/**
+	 * escape and put in a document
+	 */
+	public function testEscapeDocument()
+	{
+		$tag="<tag>I want to break</tag>";
+		$xml=XML::escape($tag);
+		$text='<text>'.$xml.'</text>';
+		$xml_parser=xml_parser_create();
+		//should be possible to parse it
+		$values=array();
+		$index=array();
+		$this->assertEquals(1, xml_parse_into_struct($xml_parser, $text, $values, $index));
+		$this->assertEquals(
+			array('TEXT'=>array(0)),
+			$index
+		);
+		$this->assertEquals(
+			array(array('tag'=>'TEXT', 'type'=>'complete', 'level'=>1, 'value'=>$tag)),
+			$values
+		);
+		xml_parser_free($xml_parser);
+	}
+}