diff --git a/test/Twig/Tests/Cache/FilesystemTest.php b/test/Twig/Tests/Cache/FilesystemTest.php
index 52bba2d08..a151ca9a4 100644
--- a/test/Twig/Tests/Cache/FilesystemTest.php
+++ b/test/Twig/Tests/Cache/FilesystemTest.php
@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+require_once dirname(__DIR__).'/FilesystemHelper.php';
+
 class Twig_Tests_Cache_FilesystemTest extends PHPUnit_Framework_TestCase
 {
     private $classname;
diff --git a/test/Twig/Tests/Fixtures/tests/in.test b/test/Twig/Tests/Fixtures/tests/in.test
index 545f51f81..fc7c3b21a 100644
--- a/test/Twig/Tests/Fixtures/tests/in.test
+++ b/test/Twig/Tests/Fixtures/tests/in.test
@@ -74,7 +74,7 @@ TRUE
 {{ 5.5 in '125.5' ? 'TRUE' : 'FALSE' }}
 {{ '5.5' in 125.5 ? 'TRUE' : 'FALSE' }}
 --DATA--
-return array('bar' => 'bar', 'foo' => array('bar' => 'bar'), 'dir_object' => new SplFileInfo(dirname(__FILE__)), 'object' => new stdClass(), 'resource' => opendir(dirname(__FILE__)))
+return array('bar' => 'bar', 'foo' => array('bar' => 'bar'), 'dir_object' => new SplFileInfo(__DIR__), 'object' => new stdClass(), 'resource' => opendir(__DIR__))
 --EXPECT--
 TRUE
 TRUE
diff --git a/test/Twig/Tests/Loader/FilesystemTest.php b/test/Twig/Tests/Loader/FilesystemTest.php
index 75fd821ef..cb2be04e1 100644
--- a/test/Twig/Tests/Loader/FilesystemTest.php
+++ b/test/Twig/Tests/Loader/FilesystemTest.php
@@ -165,7 +165,7 @@ class Twig_Tests_Loader_FilesystemTest extends PHPUnit_Framework_TestCase
     public function testArrayInheritance($templateName)
     {
         $loader = new Twig_Loader_Filesystem(array());
-        $loader->addPath(dirname(__FILE__).'/Fixtures/inheritance');
+        $loader->addPath(__DIR__.'/Fixtures/inheritance');
 
         $twig = new Twig_Environment($loader);