symfony
diff --git a/‎src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
Lines changed: 9 additions & 7 deletions b/‎src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
Lines changed: 9 additions & 7 deletions
diff --git a/‎src/Symfony/Bundle/TwigBundle/Tests/TwigEngineTest.php
Lines changed: 0 additions & 92 deletions b/‎src/Symfony/Bundle/TwigBundle/Tests/TwigEngineTest.php
Lines changed: 0 additions & 92 deletions
@@ -59,15 +59,17 @@ public function testLoadFullConfiguration($format)
 
         // Globals
         $calls = $container->getDefinition('twig')->getMethodCalls();
-        $this->assertEquals('foo', $calls[0][1][0], '->load() registers services as Twig globals');
-        $this->assertEquals(new Reference('bar'), $calls[0][1][1], '->load() registers services as Twig globals');
-        $this->assertEquals('pi', $calls[1][1][0], '->load() registers variables as Twig globals');
-        $this->assertEquals(3.14, $calls[1][1][1], '->load() registers variables as Twig globals');
+        $this->assertEquals('app', $calls[0][1][0]);
+        $this->assertEquals(new Reference('templating.globals'), $calls[0][1][1]);
+        $this->assertEquals('foo', $calls[1][1][0], '->load() registers services as Twig globals');
+        $this->assertEquals(new Reference('bar'), $calls[1][1][1], '->load() registers services as Twig globals');
+        $this->assertEquals('pi', $calls[2][1][0], '->load() registers variables as Twig globals');
+        $this->assertEquals(3.14, $calls[2][1][1], '->load() registers variables as Twig globals');
 
         // Yaml and Php specific configs
         if (in_array($format, array('yml', 'php'))) {
-            $this->assertEquals('bad', $calls[2][1][0], '->load() registers variables as Twig globals');
-            $this->assertEquals(array('key' => 'foo'), $calls[2][1][1], '->load() registers variables as Twig globals');
+            $this->assertEquals('bad', $calls[3][1][0], '->load() registers variables as Twig globals');
+            $this->assertEquals(array('key' => 'foo'), $calls[3][1][1], '->load() registers variables as Twig globals');
         }
 
         /
962A
/ Twig options
@@ -101,7 +103,7 @@ public function testGlobalsWithDifferentTypesAndValues()
 
         $calls = $container->getDefinition('twig')->getMethodCalls();
 
-        foreach ($calls as $call) {
+        foreach (array_slice($calls, 1) as $call) {
             list($name, $value) = each($globals);
             $this->assertEquals($name, $call[1][0]);
             $this->assertSame($value, $call[1][1]);