diff --git a/test/Mustache/Test/FiveThree/Functional/ClosureQuirksTest.php b/test/Mustache/Test/FiveThree/Functional/ClosureQuirksTest.php
index 52f3974..23ac43b 100644
--- a/test/Mustache/Test/FiveThree/Functional/ClosureQuirksTest.php
+++ b/test/Mustache/Test/FiveThree/Functional/ClosureQuirksTest.php
@@ -13,7 +13,7 @@
  * @group lambdas
  * @group functional
  */
-class Mustache_Test_FiveThree_Functional_ClosuresQuirksTest extends PHPUnit_Framework_TestCase
+class Mustache_Test_FiveThree_Functional_ClosureQuirksTest extends PHPUnit_Framework_TestCase
 {
     private $mustache;
 
@@ -25,6 +25,6 @@ class Mustache_Test_FiveThree_Functional_ClosuresQuirksTest extends PHPUnit_Fram
     public function testClosuresDontLikeItWhenYouTouchTheirProperties()
     {
         $tpl = $this->mustache->loadTemplate('{{ foo.bar }}');
-        $this->assertEquals('', $tpl->render(array('foo' => function() { return 'FOO'; })));
+        $this->assertEquals('', $tpl->render(array('foo' => function () { return 'FOO'; })));
     }
 }
diff --git a/test/Mustache/Test/FiveThree/Functional/FiltersTest.php b/test/Mustache/Test/FiveThree/Functional/FiltersTest.php
index 323881e..96e590a 100644
--- a/test/Mustache/Test/FiveThree/Functional/FiltersTest.php
+++ b/test/Mustache/Test/FiveThree/Functional/FiltersTest.php
@@ -27,7 +27,7 @@ class Mustache_Test_FiveThree_Functional_FiltersTest extends PHPUnit_Framework_T
     {
         $tpl = $this->mustache->loadTemplate('{{% FILTERS }}{{ date | longdate }}');
 
-        $this->mustache->addHelper('longdate', function(\DateTime $value) {
+        $this->mustache->addHelper('longdate', function (\DateTime $value) {
             return $value->format('Y-m-d h:m:s');
         });
 
@@ -41,11 +41,11 @@ class Mustache_Test_FiveThree_Functional_FiltersTest extends PHPUnit_Framework_T
     {
         $tpl = $this->mustache->loadTemplate('{{% FILTERS }}{{ date | longdate | withbrackets }}');
 
-        $this->mustache->addHelper('longdate', function(\DateTime $value) {
+        $this->mustache->addHelper('longdate', function (\DateTime $value) {
             return $value->format('Y-m-d h:m:s');
         });
 
-        $this->mustache->addHelper('withbrackets', function($value) {
+        $this->mustache->addHelper('withbrackets', function ($value) {
             return sprintf('[[%s]]', $value);
         });
 
@@ -60,7 +60,7 @@ class Mustache_Test_FiveThree_Functional_FiltersTest extends PHPUnit_Framework_T
         $tpl = $this->mustache->loadTemplate('{{% FILTERS }}{{ foo | bar }}');
         $this->assertEquals('win!', $tpl->render(array(
             'foo' => 'FOO',
-            'bar' => function($value) {
+            'bar' => function ($value) {
                 return ($value === 'FOO') ? 'win!' : 'fail :(';
             },
         )));
@@ -84,11 +84,11 @@ class Mustache_Test_FiveThree_Functional_FiltersTest extends PHPUnit_Framework_T
             array('foo | bar', array('foo' => 'FOO')),
             array('foo | bar', array('foo' => 'FOO', 'bar' => 'BAR')),
             array('foo | bar', array('foo' => 'FOO', 'bar' => array(1, 2))),
-            array('foo | bar | baz', array('foo' => 'FOO', 'bar' => function() { return 'BAR'; })),
-            array('foo | bar | baz', array('foo' => 'FOO', 'baz' => function() { return 'BAZ'; })),
-            array('foo | bar | baz', array('bar' => function() { return 'BAR'; })),
-            array('foo | bar | baz', array('baz' => function() { return 'BAZ'; })),
-            array('foo | bar.baz', array('foo' => 'FOO', 'bar' => function() { return 'BAR'; }, 'baz' => function() { return 'BAZ'; })),
+            array('foo | bar | baz', array('foo' => 'FOO', 'bar' => function () { return 'BAR'; })),
+            array('foo | bar | baz', array('foo' => 'FOO', 'baz' => function () { return 'BAZ'; })),
+            array('foo | bar | baz', array('bar' => function () { return 'BAR'; })),
+            array('foo | bar | baz', array('baz' => function () { return 'BAZ'; })),
+            array('foo | bar.baz', array('foo' => 'FOO', 'bar' => function () { return 'BAR'; }, 'baz' => function () { return 'BAZ'; })),
         );
     }
 }
diff --git a/test/Mustache/Test/FiveThree/Functional/HigherOrderSectionsTest.php b/test/Mustache/Test/FiveThree/Functional/HigherOrderSectionsTest.php
index 87cc1c4..597c93a 100644
--- a/test/Mustache/Test/FiveThree/Functional/HigherOrderSectionsTest.php
+++ b/test/Mustache/Test/FiveThree/Functional/HigherOrderSectionsTest.php
@@ -28,7 +28,7 @@ class Mustache_Test_FiveThree_Functional_HigherOrderSectionsTest extends PHPUnit
 
         $foo = new Mustache_Test_FiveThree_Functional_Foo;
         $foo->name = 'Mario';
-        $foo->wrapper = function($text) {
+        $foo->wrapper = function ($text) {
             return sprintf('<div class="anonymous">%s</div>', $text);
         };
 
@@ -53,7 +53,7 @@ class Mustache_Test_FiveThree_Functional_HigherOrderSectionsTest extends PHPUnit
 
         $data = array(
             'name' => 'Bob',
-            'wrap' => function($text) {
+            'wrap' => function ($text) {
                 return sprintf('[[%s]]', $text);
             }
         );
@@ -70,7 +70,7 @@ class Mustache_Test_FiveThree_Functional_Foo
 
     public function __construct()
     {
-        $this->wrap = function($text) {
+        $this->wrap = function ($text) {
             return sprintf('<em>%s</em>', $text);
         };
     }
diff --git a/test/Mustache/Test/FiveThree/Functional/LambdaHelperTest.php b/test/Mustache/Test/FiveThree/Functional/LambdaHelperTest.php
index 0b7c371..cf24804 100644
--- a/test/Mustache/Test/FiveThree/Functional/LambdaHelperTest.php
+++ b/test/Mustache/Test/FiveThree/Functional/LambdaHelperTest.php
@@ -29,7 +29,7 @@ class Mustache_Test_FiveThree_Functional_LambdaHelperTest extends PHPUnit_Framew
 
         $foo = new StdClass;
         $foo->name = 'Mario';
-        $foo->lambda = function($text, $mustache) {
+        $foo->lambda = function ($text, $mustache) {
             return strtoupper($mustache->render($text));
         };
 
diff --git a/test/Mustache/Test/FiveThree/Functional/MustacheSpecTest.php b/test/Mustache/Test/FiveThree/Functional/MustacheSpecTest.php
index 446aa49..88094fb 100644
--- a/test/Mustache/Test/FiveThree/Functional/MustacheSpecTest.php
+++ b/test/Mustache/Test/FiveThree/Functional/MustacheSpecTest.php
@@ -55,7 +55,7 @@ class Mustache_Test_FiveThree_Functional_MustacheSpecTest extends Mustache_Test_
                 }
 
                 $func = $val['php'];
-                $data[$key] = function($text = null) use ($func) {
+                $data[$key] = function ($text = null) use ($func) {
                     return eval($func);
                 };
             } elseif (is_array($val)) {
diff --git a/test/Mustache/Test/FiveThree/Functional/PartialLambdaIndentTest.php b/test/Mustache/Test/FiveThree/Functional/PartialLambdaIndentTest.php
index 8555735..ecc5e23 100644
--- a/test/Mustache/Test/FiveThree/Functional/PartialLambdaIndentTest.php
+++ b/test/Mustache/Test/FiveThree/Functional/PartialLambdaIndentTest.php
@@ -51,7 +51,7 @@ class Mustache_Test_Functional_ClassWithLambda
 {
     public function _t()
     {
-        return function($val) {
+        return function ($val) {
             return strtoupper($val);
         };
     }
diff --git a/test/Mustache/Test/FiveThree/Functional/SectionFiltersTest.php b/test/Mustache/Test/FiveThree/Functional/SectionFiltersTest.php
index c319ff5..0c437f6 100644
--- a/test/Mustache/Test/FiveThree/Functional/SectionFiltersTest.php
+++ b/test/Mustache/Test/FiveThree/Functional/SectionFiltersTest.php
@@ -27,7 +27,7 @@ class Mustache_Test_FiveThree_Functional_SectionFiltersTest extends PHPUnit_Fram
     {
         $tpl = $this->mustache->loadTemplate('{{% FILTERS }}{{# word | echo }}{{ . }}!{{/ word | echo }}');
 
-        $this->mustache->addHelper('echo', function($value) {
+        $this->mustache->addHelper('echo', function ($value) {
             return array($value, $value, $value);
         });
 
@@ -45,12 +45,12 @@ EOS;
     {
         $tpl = $this->mustache->loadTemplate(self::CHAINED_FILTERS_TPL);
 
-        $this->mustache->addHelper('echo', function($value) {
+        $this->mustache->addHelper('echo', function ($value) {
             return array($value, $value, $value);
         });
 
-        $this->mustache->addHelper('with_index', function($value) {
-            return array_map(function($k, $v) {
+        $this->mustache->addHelper('with_index', function ($value) {
+            return array_map(function ($k, $v) {
                 return array(
                     'key'   => $k,
                     'value' => $v,
@@ -66,7 +66,7 @@ EOS;
         $tpl = $this->mustache->loadTemplate('{{% FILTERS }}{{# foo | bar }}{{ . }}{{/ foo | bar }}');
         $this->assertEquals('win!', $tpl->render(array(
             'foo' => 'FOO',
-            'bar' => function($value) {
+            'bar' => function ($value) {
                 return ($value === 'FOO') ? 'win!' : 'fail :(';
             },
         )));
@@ -90,11 +90,11 @@ EOS;
             array('foo | bar', array('foo' => 'FOO')),
             array('foo | bar', array('foo' => 'FOO', 'bar' => 'BAR')),
             array('foo | bar', array('foo' => 'FOO', 'bar' => array(1, 2))),
-            array('foo | bar | baz', array('foo' => 'FOO', 'bar' => function() { return 'BAR'; })),
-            array('foo | bar | baz', array('foo' => 'FOO', 'baz' => function() { return 'BAZ'; })),
-            array('foo | bar | baz', array('bar' => function() { return 'BAR'; })),
-            array('foo | bar | baz', array('baz' => function() { return 'BAZ'; })),
-            array('foo | bar.baz', array('foo' => 'FOO', 'bar' => function() { return 'BAR'; }, 'baz' => function() { return 'BAZ'; })),
+            array('foo | bar | baz', array('foo' => 'FOO', 'bar' => function () { return 'BAR'; })),
+            array('foo | bar | baz', array('foo' => 'FOO', 'baz' => function () { return 'BAZ'; })),
+            array('foo | bar | baz', array('bar' => function () { return 'BAR'; })),
+            array('foo | bar | baz', array('baz' => function () { return 'BAZ'; })),
+            array('foo | bar.baz', array('foo' => 'FOO', 'bar' => function () { return 'BAR'; }, 'baz' => function () { return 'BAZ'; })),
         );
     }
 
diff --git a/test/Mustache/Test/FiveThree/Functional/StrictCallablesTest.php b/test/Mustache/Test/FiveThree/Functional/StrictCallablesTest.php
index 96e6147..9f68639 100644
--- a/test/Mustache/Test/FiveThree/Functional/StrictCallablesTest.php
+++ b/test/Mustache/Test/FiveThree/Functional/StrictCallablesTest.php
@@ -32,7 +32,7 @@ class Mustache_Test_FiveThree_Functional_StrictCallablesTest extends PHPUnit_Fra
 
     public function callables()
     {
-        $lambda = function($tpl, $mustache) {
+        $lambda = function ($tpl, $mustache) {
             return strtoupper($mustache->render($tpl));
         };
 
@@ -49,7 +49,7 @@ class Mustache_Test_FiveThree_Functional_StrictCallablesTest extends PHPUnit_Fra
                 'YOSHI',
             ),
             array(
-                function() { return 'Yoshi'; },
+                function () { return 'Yoshi'; },
                 $lambda,
                 'YOSHI',
             ),
@@ -91,14 +91,14 @@ class Mustache_Test_FiveThree_Functional_StrictCallablesTest extends PHPUnit_Fra
 
     public function strictCallables()
     {
-        $lambda = function($tpl, $mustache) {
+        $lambda = function ($tpl, $mustache) {
             return strtoupper($mustache->render($tpl));
         };
 
         return array(
             // Interpolation lambdas
             array(
-                function() { return 'Yoshi'; },
+                function () { return 'Yoshi'; },
                 $lambda,
                 'YOSHI',
             ),
@@ -116,7 +116,7 @@ class Mustache_Test_FiveThree_Functional_StrictCallablesTest extends PHPUnit_Fra
             ),
             array(
                 'Yoshi',
-                function($tpl, $mustache) {
+                function ($tpl, $mustache) {
                     return strtoupper($mustache->render($tpl));
                 },
                 'YOSHI',