diff --git a/bin/build_bootstrap.php b/bin/build_bootstrap.php
index 8a63803..cc23b2b 100755
--- a/bin/build_bootstrap.php
+++ b/bin/build_bootstrap.php
@@ -78,7 +78,7 @@ class SymfonyClassCollectionLoader
 {
     private static $loaded;
 
-    const HEADER = <<<EOS
+    const HEADER = <<<'EOS'
 <?php
 
 /*
diff --git a/test/Mustache/Test/EngineTest.php b/test/Mustache/Test/EngineTest.php
index ab56185..3da748b 100644
--- a/test/Mustache/Test/EngineTest.php
+++ b/test/Mustache/Test/EngineTest.php
@@ -317,7 +317,7 @@ class Mustache_Test_EngineTest extends Mustache_Test_FunctionalTestCase
         list($name, $mustache) = $this->getLoggedMustache(Mustache_Logger::DEBUG);
         $mustache->render('{{ foo }}{{> bar }}', array('foo' => 'FOO'));
         $log = file_get_contents($name);
-        $this->assertContains('DEBUG: Instantiating template: ',   $log);
+        $this->assertContains('DEBUG: Instantiating template: ', $log);
         $this->assertContains('WARNING: Partial not found: "bar"', $log);
     }
 
diff --git a/test/Mustache/Test/FiveThree/Functional/FiltersTest.php b/test/Mustache/Test/FiveThree/Functional/FiltersTest.php
index a6236fa..c9d1549 100644
--- a/test/Mustache/Test/FiveThree/Functional/FiltersTest.php
+++ b/test/Mustache/Test/FiveThree/Functional/FiltersTest.php
@@ -77,7 +77,7 @@ class Mustache_Test_FiveThree_Functional_FiltersTest extends PHPUnit_Framework_T
         $this->assertEquals('[[2000-01-01 12:01:00]]', $tpl->render($foo));
     }
 
-    const CHAINED_SECTION_FILTERS_TPL = <<<EOS
+    const CHAINED_SECTION_FILTERS_TPL = <<<'EOS'
 {{% FILTERS }}
 {{# word | echo | with_index }}
 {{ key }}: {{ value }}
diff --git a/test/Mustache/Test/FiveThree/Functional/PartialLambdaIndentTest.php b/test/Mustache/Test/FiveThree/Functional/PartialLambdaIndentTest.php
index 8fcfc04..e9aff7e 100644
--- a/test/Mustache/Test/FiveThree/Functional/PartialLambdaIndentTest.php
+++ b/test/Mustache/Test/FiveThree/Functional/PartialLambdaIndentTest.php
@@ -17,18 +17,18 @@ class Mustache_Test_FiveThree_Functional_PartialLambdaIndentTest extends PHPUnit
 {
     public function testLambdasInsidePartialsAreIndentedProperly()
     {
-        $src = <<<EOS
+        $src = <<<'EOS'
 <fieldset>
   {{> input }}
 </fieldset>
 
 EOS;
-        $partial = <<<EOS
+        $partial = <<<'EOS'
 <input placeholder="{{# _t }}Enter your name{{/ _t }}">
 
 EOS;
 
-        $expected = <<<EOS
+        $expected = <<<'EOS'
 <fieldset>
   <input placeholder="ENTER YOUR NAME">
 </fieldset>
@@ -47,18 +47,18 @@ EOS;
 
     public function testLambdaInterpolationsInsidePartialsAreIndentedProperly()
     {
-        $src = <<<EOS
+        $src = <<<'EOS'
 <fieldset>
   {{> input }}
 </fieldset>
 
 EOS;
-        $partial = <<<EOS
+        $partial = <<<'EOS'
 <input placeholder="{{ placeholder }}">
 
 EOS;
 
-        $expected = <<<EOS
+        $expected = <<<'EOS'
 <fieldset>
   <input placeholder="Enter your name">
 </fieldset>
diff --git a/test/Mustache/Test/Functional/CallTest.php b/test/Mustache/Test/Functional/CallTest.php
index 7ffd53e..4c5cbac 100644
--- a/test/Mustache/Test/Functional/CallTest.php
+++ b/test/Mustache/Test/Functional/CallTest.php
@@ -32,6 +32,7 @@ class Mustache_Test_Functional_CallTest extends PHPUnit_Framework_TestCase
 class Mustache_Test_Functional_ClassWithCall
 {
     public $name;
+
     public function __call($method, $args)
     {
         return 'unknown value';
diff --git a/test/fixtures/examples/simple/Simple.php b/test/fixtures/examples/simple/Simple.php
index cfc746b..f8e431d 100644
--- a/test/fixtures/examples/simple/Simple.php
+++ b/test/fixtures/examples/simple/Simple.php
@@ -11,4 +11,4 @@ class Simple
     }
 
     public $in_ca = true;
-};
+}