diff --git a/.travis.yml b/.travis.yml
index 2680c030d3..08a1871293 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,14 +4,19 @@ php:
   - 5.3
   - 5.4
   - 5.5
+  - hhvm
+
+matrix:
+  allow_failures:
+    - php: hhvm
 
 before_script:
   - composer self-update
   - composer install --prefer-source
-  - php app/console doctrine:database:create -e=test
-  - php app/console doctrine:phpcr:init:dbal -e=test
-  - php app/console doctrine:phpcr:workspace:create standard_test -e=test
-  - php app/console doctrine:phpcr:repository:init -e=test
+  - app/console doctrine:database:create -e=test
+  - app/console doctrine:phpcr:init:dbal -e=test
+  - app/console doctrine:phpcr:workspace:create standard_test -e=test
+  - app/console doctrine:phpcr:repository:init -e=test
 
 script: phpunit -c app
 
diff --git a/composer.json b/composer.json
index 975d9ee313..f9c66f13ed 100644
--- a/composer.json
+++ b/composer.json
@@ -40,17 +40,17 @@
     "scripts": {
         "post-install-cmd": [
             "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
+            "Symfony\\Cmf\\Bundle\\CreateBundle\\Composer\\ScriptHandler::downloadCreateAndCkeditor",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
-            "Symfony\\Cmf\\Bundle\\CreateBundle\\Composer\\ScriptHandler::downloadCreateAndCkeditor",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile"
         ],
         "post-update-cmd": [
             "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
+            "Symfony\\Cmf\\Bundle\\CreateBundle\\Composer\\ScriptHandler::downloadCreateAndCkeditor",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
-            "Symfony\\Cmf\\Bundle\\CreateBundle\\Composer\\ScriptHandler::downloadCreateAndCkeditor",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile"
         ]