diff --git a/templates/test/add_data.phtml b/templates/test/add_data.phtml
new file mode 100644
index 0000000000..eee5ebe053
--- /dev/null
+++ b/templates/test/add_data.phtml
@@ -0,0 +1,3 @@
+<?php
+echo $variable1;
+echo $variable2;
diff --git a/templates/test/add_function.phtml b/templates/test/add_function.phtml
new file mode 100644
index 0000000000..5b8fe908c0
--- /dev/null
+++ b/templates/test/add_function.phtml
@@ -0,0 +1,2 @@
+<?php
+echo hello($variable);
diff --git a/test/classes/TemplateTest.php b/test/classes/TemplateTest.php
index 69a148a903..acf310ba68 100644
--- a/test/classes/TemplateTest.php
+++ b/test/classes/TemplateTest.php
@@ -15,6 +15,64 @@ require_once 'test/PMATestCase.php';
  */
 class TemplateTest extends PMATestCase
 {
+    /**
+     * Test for setData
+     *
+     * @return void
+     */
+    public function testSetData()
+    {
+        $template = PMA\libraries\Template::get('test/echo');
+        $template->setData(
+            array(
+                'variable' => 'value'
+            )
+        );
+        $this->assertEquals('value', $template->render());
+    }
+
+    /**
+     * Test for addData
+     *
+     * @return void
+     */
+    public function testAddData()
+    {
+        $template = PMA\libraries\Template::get('test/addData');
+        $template->addData(
+            array(
+                'variable1' => 'value1'
+            )
+        );
+        $template->addData(
+            array(
+                'variable2' => 'value2'
+            )
+        );
+        $result = $template->render();
+        $this->assertContains('value1', $result);
+        $this->assertContains('value2', $result);
+    }
+
+    /**
+     * Test for addFunction
+     *
+     * @return void
+     */
+    public function testAddFunction()
+    {
+        $template = PMA\libraries\Template::get('test/add_function');
+        $template->addFunction('hello', function ($string) {
+            return 'hello ' . $string;
+        });
+        $template->addData(
+            array(
+                'variable' => 'world'
+            )
+        );
+        $this->assertEquals('hello world', $template->render());
+    }
+
     /**
      * Test for render
      *