diff --git a/phpBB/includes/template.php b/phpBB/includes/template.php
index e1e96791c9..109f7a29ee 100644
--- a/phpBB/includes/template.php
+++ b/phpBB/includes/template.php
@@ -260,6 +260,7 @@ class phpbb_template
 			}
 		}
 
+		/*
 		if (defined('IN_ERROR_HANDLER'))
 		{
 			if ((E_NOTICE & error_reporting()) == E_NOTICE)
@@ -267,6 +268,7 @@ class phpbb_template
 				error_reporting(error_reporting() ^ E_NOTICE);
 			}
 		}
+		*/
 
 		$_tpldata	= &$this->_tpldata;
 		$_rootref	= &$this->_rootref;
diff --git a/tests/template/template_test.php b/tests/template/template_test.php
index e549c9a0c8..b81a2a6152 100644
--- a/tests/template/template_test.php
+++ b/tests/template/template_test.php
@@ -381,14 +381,14 @@ class phpbb_template_template_test extends phpbb_test_case
 			$this->template->destroy_block_vars($block);
 		}
 
-		$error_level = error_reporting();
-		error_reporting($error_level & ~E_NOTICE);
+		//$error_level = error_reporting();
+		//error_reporting($error_level & ~E_NOTICE);
 
 		$this->assertEquals($expected, self::trim_template_result($this->template->assign_display('test')), "Testing assign_display($file)");
 
 		$this->template->assign_display('test', 'VARIABLE', false);
 
-		error_reporting($error_level);
+		//error_reporting($error_level);
 
 		$this->assertEquals($expected, $this->display('container'), "Testing assign_display($file)");
 	}