--- Symfony/Component/HttpFoundation/Tests/bootstrap.php	2012-09-20 03:42:11.000000000 -0400
+++ Symfony/Component/HttpFoundation/Tests/bootstrap.php	2012-10-21 00:45:21.962629147 -0400
@@ -9,14 +9,38 @@
  * file that was distributed with this source code.
  */
 
+date_default_timezone_set('UTC');
 spl_autoload_register(function ($class) {
     if (ltrim('SessionHandlerInterface', '/') === $class) {
-        require_once __DIR__.'/../Resources/stubs/SessionHandlerInterface.php';
+        $file = '/Resources/stubs/SessionHandlerInterface.php';
+    	if (file_exists(__DIR__.'/..'.$file)) {
+    	    // Load from source tree
+    	    require_once __DIR__.'/..'.$file;
+    	} else {
+	    try {
+	        // Try loading from include path
+	        require_once 'Symfony/Component/HttpFoundation'.$file;
+	    } catch (Exception $e) {
+	        // Fail silently so class not found fatal error still raised
+	    }
+    	}
     }
 
-    if (0 !== strpos(ltrim($class, '/'), 'Symfony\Component\HttpFoundation')) {
+    if (0 !== strpos(ltrim($class, '/'), 'Symfony\Component')) {
         return;
     }
 
-    require_once __DIR__.'/../'.substr(str_replace('\\', '/', $class), strlen('Symfony\Component\HttpFoundation')).'.php';
+    $file = substr(str_replace('\\', '/', $class), strlen('Symfony\Component')).'.php';
+
+    if (file_exists(__DIR__.'/../..'.$file)) {
+        // Load from source tree
+        require_once __DIR__.'/../..'.$file;
+    } else {
+        try {
+	    // Try loading from incude path
+	    require_once 'Symfony/Component'.$file;
+        } catch (Exception $e) {
+	    // Fail silently so class not found fatal error still raised
+        }
+    }
 });