diff --git a/.gitignore b/.gitignore
index 15977fb..3861f00 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.php_cs.cache
 composer.lock
-vendor
 mustache.php
+vendor
diff --git a/.php_cs b/.php_cs
index 1265160..6fb0311 100644
--- a/.php_cs
+++ b/.php_cs
@@ -1,34 +1,21 @@
 <?php
 
 use Symfony\CS\Config\Config;
-use Symfony\CS\Fixer;
 use Symfony\CS\FixerInterface;
 
-$fixer = new Fixer();
-$fixer->registerBuiltInFixers();
+$config = Config::create()
+    // use default level and extra fixers:
+    ->fixers(array('-concat_without_spaces', 'concat_with_spaces', 'strict', 'strict_param'))
+    ->setUsingCache(true)
+    ->setUsingLinter(false);
 
-$fixers = array();
+$finder = $config->getFinder()
+    ->in(__DIR__)
+    ->exclude('bin');
 
-foreach ($fixer->getFixers() as $fixer) {
-    $level = $fixer->getLevel();
-
-    if (!isset($fixers[$level])) {
-        $fixers[$level] = array();
-    }
-
-    $fixers[$level][] = $fixer->getName();
+// exclude file due to error on PHP 5.3 that ignore content after __halt_compiler when using token_get_all
+if (version_compare(PHP_VERSION, '5.4', '<')) {
+    $finder->notPath('test/Mustache/Test/Loader/InlineLoaderTest.php');
 }
 
-$fixers = array_merge(
-    $fixers[FixerInterface::PSR0_LEVEL],
-    $fixers[FixerInterface::PSR1_LEVEL],
-    $fixers[FixerInterface::PSR2_LEVEL],
-    $fixers[FixerInterface::ALL_LEVEL],
-    array('concat_with_spaces', 'strict')
-);
-
-$config = new Config();
-$config->fixers($fixers);
-$config->getFinder()->in(__DIR__)->exclude('bin');
-
 return $config;
diff --git a/.travis.yml b/.travis.yml
index 59c9d31..fbbbc72 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,11 @@
 language: php
 
 install:
-  - curl http://cs.sensiolabs.org/get/php-cs-fixer.phar -o php-cs-fixer.phar
+  - curl http://get.sensiolabs.org/php-cs-fixer.phar -o php-cs-fixer.phar
 
 script:
   - phpunit
-  - if [[ `php -r "echo version_compare(PHP_VERSION, '5.3.6', '>=');"` ]]; then php php-cs-fixer.phar --dry-run -v fix .; fi
+  - if [[ `php -r "echo version_compare(PHP_VERSION, '5.3.6', '>=') && !defined('HHVM_VERSION');"` ]]; then php php-cs-fixer.phar --diff --dry-run -vv fix; fi
 
 php:
   - 5.2
diff --git a/test/Mustache/Test/Functional/InheritanceTest.php b/test/Mustache/Test/Functional/InheritanceTest.php
index f0d3235..5b3ba0c 100644
--- a/test/Mustache/Test/Functional/InheritanceTest.php
+++ b/test/Mustache/Test/Functional/InheritanceTest.php
@@ -268,8 +268,7 @@ class Mustache_Test_Functional_InheritanceTest extends PHPUnit_Framework_TestCas
     public function testInheritIndentationWhenOverridingAPartial()
     {
         $partials = array(
-            'partial' =>
-                'stop:
+            'partial' => 'stop:
                     {{$nineties}}collaborate and listen{{/nineties}}',
         );