diff --git a/tests/template/invalid_constructs_test.php b/tests/template/invalid_constructs_test.php
new file mode 100644
index 0000000000..19d192b8b6
--- /dev/null
+++ b/tests/template/invalid_constructs_test.php
@@ -0,0 +1,87 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/template_test_case.php';
+
+class phpbb_template_invalid_constructs_test extends phpbb_template_template_test_case
+{
+	public function template_data()
+	{
+		return array(
+			array(
+				'Unknown tag',
+				'invalid/unknown_tag.html',
+				array(),
+				array(),
+				array(),
+				'invalid/output/unknown_tag.html',
+			),
+			/*
+			* Produces a parse error which is fatal, therefore
+			* destroying the test suite.
+			array(
+				'ENDIF without IF',
+				'invalid/endif_without_if.html',
+				array(),
+				array(),
+				array(),
+				'invalid/output/endif_without_if.html',
+			),
+			*/
+		);
+	}
+
+	public function template_data_error()
+	{
+		return array(
+			array(
+				'Include a nonexistent file',
+				'invalid/include_nonexistent_file.html',
+				array(),
+				array(),
+				array(),
+				E_USER_ERROR,
+				'invalid/output/include_nonexistent_file.html',
+			),
+		);
+	}
+
+	/**
+	* @dataProvider template_data
+	*/
+	public function test_template($description, $file, $vars, $block_vars, $destroy, $expected)
+	{
+		$cache_file = $this->template->cachepath . str_replace('/', '.', $file) . '.php';
+
+		$this->assertFileNotExists($cache_file);
+
+		$expected = file_get_contents(dirname(__FILE__) . '/templates/' . $expected);
+		// apparently the template engine does not put
+		// the trailing newline into compiled templates
+		$expected = trim($expected);
+		$this->run_template($file, $vars, $block_vars, $destroy, $expected, $cache_file);
+	}
+
+	/**
+	* @dataProvider template_data_error
+	*/
+	public function test_template_error($description, $file, $vars, $block_vars, $destroy, $error, $expected)
+	{
+		$cache_file = $this->template->cachepath . str_replace('/', '.', $file) . '.php';
+
+		$this->assertFileNotExists($cache_file);
+
+		$expected = file_get_contents(dirname(__FILE__) . '/templates/' . $expected);
+		// apparently the template engine does not put
+		// the trailing newline into compiled templates
+		$expected = trim($expected);
+		$this->setExpectedTriggerError($error, $expected);
+		$this->run_template($file, $vars, $block_vars, $destroy, '', $cache_file);
+	}
+}
diff --git a/tests/template/templates/invalid/endif_without_if.html b/tests/template/templates/invalid/endif_without_if.html
new file mode 100644
index 0000000000..e371ffd150
--- /dev/null
+++ b/tests/template/templates/invalid/endif_without_if.html
@@ -0,0 +1 @@
+<!-- ENDIF -->
diff --git a/tests/template/templates/invalid/include_nonexistent_file.html b/tests/template/templates/invalid/include_nonexistent_file.html
new file mode 100644
index 0000000000..617d2fdaaa
--- /dev/null
+++ b/tests/template/templates/invalid/include_nonexistent_file.html
@@ -0,0 +1 @@
+<!-- INCLUDE nonexistent.html -->
diff --git a/tests/template/templates/invalid/output/endif_without_if.html b/tests/template/templates/invalid/output/endif_without_if.html
new file mode 100644
index 0000000000..5f2239c964
--- /dev/null
+++ b/tests/template/templates/invalid/output/endif_without_if.html
@@ -0,0 +1 @@
+Parse error (fatal, destroys php runtime).
diff --git a/tests/template/templates/invalid/output/include_nonexistent_file.html b/tests/template/templates/invalid/output/include_nonexistent_file.html
new file mode 100644
index 0000000000..8a118d2713
--- /dev/null
+++ b/tests/template/templates/invalid/output/include_nonexistent_file.html
@@ -0,0 +1 @@
+style resource locator: File for handle nonexistent.html does not exist. Could not find:
diff --git a/tests/template/templates/invalid/output/unknown_tag.html b/tests/template/templates/invalid/output/unknown_tag.html
new file mode 100644
index 0000000000..1489e5e31a
--- /dev/null
+++ b/tests/template/templates/invalid/output/unknown_tag.html
@@ -0,0 +1 @@
+<!-- UNKNOWNTAG variable.html -->
diff --git a/tests/template/templates/invalid/unknown_tag.html b/tests/template/templates/invalid/unknown_tag.html
new file mode 100644
index 0000000000..1489e5e31a
--- /dev/null
+++ b/tests/template/templates/invalid/unknown_tag.html
@@ -0,0 +1 @@
+<!-- UNKNOWNTAG variable.html -->