diff --git a/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/CompileBlockPluginTest.php b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/CompileBlockPluginTest.php
index ccc3fc51..c7226f03 100644
--- a/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/CompileBlockPluginTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/CompileBlockPluginTest.php
@@ -252,6 +252,18 @@ class CompileBlockPluginTest extends PHPUnit_Smarty
         $this->smarty->registerDefaultPluginHandler('my_block_plugin_handler');
         $this->assertEquals('defaultblock hello world', $this->smarty->fetch('default2.tpl'));
     }
+    /**
+     * test tag stack
+     *
+     * @run InSeparateProcess
+     * @preserveGlobalState disabled
+     *
+     */
+    public function testBlockPluginTagStack()
+    {
+        $this->assertEquals('noop-teststack', $this->smarty->fetch('tag_stack.tpl'));
+        $this->assertEmpty($this->smarty->_cache['_tag_stack']);
+    }
 
     /**
      * Test caching
diff --git a/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/PHPunitplugins/block.noop.php b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/PHPunitplugins/block.noop.php
new file mode 100644
index 00000000..0e163e59
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/PHPunitplugins/block.noop.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Smarty plugin for testing block plugins
+ *
+ * @package    Smarty
+ * @subpackage PHPunitPlugin
+ */
+
+/**
+ * Smarty {noop}{/noop} block plugin
+ *
+ * @param array       $params parameter array
+ * @param string $content  contents of the block
+ * @param object $template template object
+ * @param  bool      $repeat flag
+ *
+ * @return string content re-formatted
+ */
+function smarty_block_noop($params, $content, $template, &$repeat)
+{
+    if (isset($content)) {
+           return $content;
+    }
+}
diff --git a/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/PHPunitplugins/block.teststack.php b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/PHPunitplugins/block.teststack.php
new file mode 100644
index 00000000..f1eef38d
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/PHPunitplugins/block.teststack.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Smarty plugin for testing block plugins
+ *
+ * @package    Smarty
+ * @subpackage PHPunitPlugin
+ */
+
+/**
+ * Smarty {teststack}{/teststack} block plugin
+ *
+ * @param array       $params parameter array
+ * @param string $content  contents of the block
+ * @param object $template template object
+ * @param  bool      $repeat flag
+ *
+ * @return string content re-formatted
+ */
+function smarty_block_teststack($params, $content, $template, &$repeat)
+{
+    if (isset($content)) {
+        $stack = $template->smarty->_cache['_tag_stack'];
+        return $stack[0][0] . '-' . $stack[1][0];
+    }
+}
diff --git a/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/tag_stack.tpl b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/tag_stack.tpl
new file mode 100644
index 00000000..6cbc1404
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/tag_stack.tpl
@@ -0,0 +1 @@
+{noop}{teststack}{/teststack}{/noop}
\ No newline at end of file