diff --git a/phpBB/phpbb/template/twig/loader.php b/phpBB/phpbb/template/twig/loader.php
index 607dfcd078..3273520d86 100644
--- a/phpBB/phpbb/template/twig/loader.php
+++ b/phpBB/phpbb/template/twig/loader.php
@@ -22,6 +22,16 @@ class loader extends \Twig_Loader_Filesystem
 {
 	protected $safe_directories = array();
 
+	/**
+	 * Constructor
+	 *
+	 * @param string|array	$paths
+	 */
+	public function __construct($paths = array())
+	{
+		parent::__construct($paths, __DIR__);
+	}
+
 	/**
 	* Set safe directories
 	*
diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php
index 58c3878b8b..2957749e89 100644
--- a/tests/functional/extension_controller_test.php
+++ b/tests/functional/extension_controller_test.php
@@ -89,6 +89,15 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 		$this->phpbb_extension_manager->purge('foo/bar');
 	}
 
+	/**
+	* Check includejs/includecss when the request_uri is a subdirectory
+	*/
+	public function test_controller_template_include_js_css()
+	{
+		$crawler = self::request('GET', 'app.php/help/faq');
+		$this->assertContains("./../../assets/javascript/core.js", $crawler->filter('body')->html());
+	}
+
 	/**
 	* Check the error produced by calling a controller without a required
 	* argument.