diff --git a/.travis.yml b/.travis.yml
index d1e219f745249..aaafa3214f829 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,5 +9,3 @@ before_script:
- COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev install
- php src/Symfony/Component/Locale/Resources/data/build-data.php
- export USE_INTL_ICU_DATA_VERSION=1
-
-script: phpunit -dzend.enable_gc=0
diff --git a/autoload.php.dist b/autoload.php.dist
index d5330986dc624..2be61eb189fcf 100644
--- a/autoload.php.dist
+++ b/autoload.php.dist
@@ -1,5 +1,11 @@
=') && gc_enabled()) {
+ // Disabling Zend Garbage Collection to prevent segfaults with PHP5.4+
+ // https://bugs.php.net/bug.php?id=53976
+ gc_disable();
+}
+
$loader = require_once __DIR__.'/vendor/autoload.php';
use Doctrine\Common\Annotations\AnnotationRegistry;
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 4385de9da93ad..823b03f7c0d72 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -14,6 +14,7 @@
+