diff --git a/templates/test/add_data_twig.twig b/templates/test/add_data_twig.twig
new file mode 100644
index 0000000000..d562612b35
--- /dev/null
+++ b/templates/test/add_data_twig.twig
@@ -0,0 +1,2 @@
+{{ variable1 }}
+{{ variable2 }}
diff --git a/templates/test/echo_twig.twig b/templates/test/echo_twig.twig
new file mode 100644
index 0000000000..9c5fc602d3
--- /dev/null
+++ b/templates/test/echo_twig.twig
@@ -0,0 +1 @@
+{{ variable -}}
diff --git a/templates/test/static_twig.twig b/templates/test/static_twig.twig
new file mode 100644
index 0000000000..703390d105
--- /dev/null
+++ b/templates/test/static_twig.twig
@@ -0,0 +1 @@
+static content
\ No newline at end of file
diff --git a/test/classes/TemplateTest.php b/test/classes/TemplateTest.php
index a048295935..8f7e8e9e9e 100644
--- a/test/classes/TemplateTest.php
+++ b/test/classes/TemplateTest.php
@@ -18,11 +18,13 @@ class TemplateTest extends PMATestCase
     /**
      * Test for set function
      *
+     * @dataProvider providerTestSet
+     *
      * @return void
      */
-    public function testSet()
+    public function testSet($data)
     {
-        $template = PMA\libraries\Template::get('test/add_data');
+        $template = PMA\libraries\Template::get($data);
         $template->set('variable1', 'value1');
         $template->set(
             array(
@@ -34,6 +36,19 @@ class TemplateTest extends PMATestCase
         $this->assertContains('value2', $result);
     }
 
+    /**
+     * Data provider for testSet
+     *
+     * @return array
+     */
+    public function providerTestSet()
+    {
+        return [
+            ['test/add_data'],
+            ['test/add_data_twig'],
+        ];
+    }
+
     /**
      * Test for setHelper
      *
@@ -64,6 +79,10 @@ class TemplateTest extends PMATestCase
             'static content',
             PMA\libraries\Template::get('test/static')->render()
         );
+        $this->assertEquals(
+            'static content',
+            PMA\libraries\Template::get('test/static_twig')->render()
+        );
     }
 
     /**
@@ -81,5 +100,13 @@ class TemplateTest extends PMATestCase
                 )
             )
         );
+        $this->assertEquals(
+            'value',
+            PMA\libraries\Template::get('test/echo_twig')->render(
+                array(
+                    'variable' => 'value'
+                )
+            )
+        );
     }
 }