diff --git a/test/php/library/Businessprocess/Html/HtmlTagTest.php b/test/php/library/Businessprocess/Html/HtmlTagTest.php
new file mode 100644
index 0000000..4b24558
--- /dev/null
+++ b/test/php/library/Businessprocess/Html/HtmlTagTest.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Tests\Icinga\Module\Businessprocess\Html;
+
+use Icinga\Module\Businessprocess\Html\HtmlTag;
+use Icinga\Module\Businessprocess\Test\BaseTestCase;
+
+class HtmlTagTest extends BaseTestCase
+{
+    public function testH1isRendered()
+    {
+        $h1 = HtmlTag::h1('Hea & der');
+        $this->assertEquals(
+            $h1->render(),
+            '<h1>Hea &amp; der</h1>'
+        );
+    }
+}
diff --git a/test/php/library/Businessprocess/Html/TextTest.php b/test/php/library/Businessprocess/Html/TextTest.php
new file mode 100644
index 0000000..4970ec6
--- /dev/null
+++ b/test/php/library/Businessprocess/Html/TextTest.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Tests\Icinga\Module\Businessprocess\Html;
+
+use Icinga\Module\Businessprocess\Html\Text;
+use Icinga\Module\Businessprocess\Test\BaseTestCase;
+
+class TextTest extends BaseTestCase
+{
+    public function testTextIsReturnedAsGiven()
+    {
+        $this->assertEquals(
+            'A & O',
+            Text::create('A & O')->getText()
+        );
+    }
+
+    public function testTextIsEscapedWhenRendered()
+    {
+        $this->assertEquals(
+            'A &amp; O',
+            Text::create('A & O')->render()
+        );
+    }
+}