diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates/asp.tpl b/tests/UnitTests/TemplateSource/TagTests/Php/templates/asp.tpl
new file mode 100644
index 00000000..c3a2433e
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/templates/asp.tpl
@@ -0,0 +1,4 @@
+--><% echo 'hello world ';
+echo '<% ';
+echo '%> ';
+%><--
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates/php.tpl b/tests/UnitTests/TemplateSource/TagTests/Php/templates/php.tpl
new file mode 100644
index 00000000..8a9acec6
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/templates/php.tpl
@@ -0,0 +1,5 @@
+--><?php echo ' hello world ';
+echo '<?php ';
+echo '?> ';
+$foo = 3;
+?><--
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates/php2.tpl b/tests/UnitTests/TemplateSource/TagTests/Php/templates/php2.tpl
new file mode 100644
index 00000000..44beed4a
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/templates/php2.tpl
@@ -0,0 +1,4 @@
+--><? echo ' hello world ';
+echo '<?  ';
+echo '?> ';
+?><--
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates/php_block_comment.tpl b/tests/UnitTests/TemplateSource/TagTests/Php/templates/php_block_comment.tpl
new file mode 100644
index 00000000..4524e45e
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/templates/php_block_comment.tpl
@@ -0,0 +1,16 @@
+--><?php echo ' hello world ';
+/*
+* comment <?php is okay
+*
+* comment <?php once again
+*/
+
+echo '<?php ';
+
+/*
+* other comment <% foo
+*/
+
+echo '?> ';
+$foo = 3;
+?><--
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates/php_line_comment.tpl b/tests/UnitTests/TemplateSource/TagTests/Php/templates/php_line_comment.tpl
new file mode 100644
index 00000000..176d3580
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/templates/php_line_comment.tpl
@@ -0,0 +1,12 @@
+--><?php echo ' hello world ';
+// comment <?php is okay
+//
+// comment <?php once again
+
+echo '<?php ';
+
+// other comment <% foo
+
+echo '?> ';
+$foo = 3;
+?><--
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates/phptag.tpl b/tests/UnitTests/TemplateSource/TagTests/Php/templates/phptag.tpl
new file mode 100644
index 00000000..f7b92e9f
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/templates/phptag.tpl
@@ -0,0 +1,5 @@
+-->{php} echo ' hello world ';
+echo '{php} ';
+echo '{/php} ';
+$foo = 3;
+{/php}<--
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates/phptag_block_comment.tpl b/tests/UnitTests/TemplateSource/TagTests/Php/templates/phptag_block_comment.tpl
new file mode 100644
index 00000000..af837c78
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/templates/phptag_block_comment.tpl
@@ -0,0 +1,16 @@
+-->{php} echo ' hello world ';
+/*
+*    comment {/php} is okay
+*
+* comment {/php} once again {/php} foo
+*/
+
+echo '{php} ';
+
+/*
+* other comment <% foo
+*/
+
+echo '{/php} ';
+$foo = 3;
+{/php}<--
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates/phptag_line_comment.tpl b/tests/UnitTests/TemplateSource/TagTests/Php/templates/phptag_line_comment.tpl
new file mode 100644
index 00000000..16907ce2
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/templates/phptag_line_comment.tpl
@@ -0,0 +1,12 @@
+-->{php} echo ' hello world ';
+// comment {/php} is okay
+//
+// comment {/php} once again {/php} foo
+
+echo '{php} ';
+
+// other comment <% foo
+
+echo '{/php} ';
+$foo = 3;
+{/php}<--
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates/phptag_literal.tpl b/tests/UnitTests/TemplateSource/TagTests/Php/templates/phptag_literal.tpl
new file mode 100644
index 00000000..24420541
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/templates/phptag_literal.tpl
@@ -0,0 +1,5 @@
+-->{ php} echo ' hello world ';
+echo 'foo ';
+echo 'bar ';
+$foo = 3;
+{ /php}<--
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates/phptag_nocache.tpl b/tests/UnitTests/TemplateSource/TagTests/Php/templates/phptag_nocache.tpl
new file mode 100644
index 00000000..086a25f0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/templates/phptag_nocache.tpl
@@ -0,0 +1,2 @@
+-->{php nocache} echo $_smarty_tpl->getTemplateVars('foo');
+{/php}<--
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates/script.tpl b/tests/UnitTests/TemplateSource/TagTests/Php/templates/script.tpl
new file mode 100644
index 00000000..0e832887
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/templates/script.tpl
@@ -0,0 +1,5 @@
+--><script language='php'>
+echo ' hello world ';
+echo '<script language=\'php\'> ';
+echo '</script> ';
+</script><--
\ No newline at end of file