diff --git a/.appveyor.yml b/.appveyor.yml
index 1155c1e754..552c26ce55 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -63,6 +63,7 @@ test_script:
     - SET X=0
     - cd c:\php && copy /Y php.ini-min php.ini
     - cd c:\projects\symfony
+    - IF %APPVEYOR_REPO_BRANCH% neq master (rm -Rf src\Symfony\Bridge\PhpUnit)
     - php phpunit src\Symfony --exclude-group benchmark,intl-data || SET X=!errorlevel!
     - cd c:\php && 7z x php-5.5.9-nts-Win32-VC11-x86.zip -y >nul && copy /Y php.ini-min php.ini
     - cd c:\projects\symfony
diff --git a/.travis.yml b/.travis.yml
index fbb4e2638d..824e290483 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -224,6 +224,12 @@ install:
           SYMFONY_VERSION=$(cat composer.json | grep '^ *"dev-master". *"[1-9]' | grep -o '[0-9.]*')
       fi
 
+    - |
+      # Skip the phpunit-bridge on not-master branches when $deps is empty
+      if [[ ! $deps && $TRAVIS_BRANCH != master ]]; then
+          COMPONENTS=$(find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist -not -wholename '*/Bridge/PhpUnit/*' -printf '%h\n')
+      fi
+
     - |
       # Install symfony/flex
       if [[ $deps = low ]]; then
@@ -271,6 +277,7 @@ install:
               echo "$COMPONENTS" | parallel --gnu -j10% "tfold {} 'cd {} && ([ -e composer.lock ] && ${COMPOSER_UP/update/install} || $COMPOSER_UP --prefer-lowest --prefer-stable) && $PHPUNIT_X'"
               echo "$COMPONENTS" | xargs -n1 -I{} tar --append -f ~/php-ext/composer-lowest.lock.tar {}/composer.lock
           elif [[ $PHP = hhvm* ]]; then
+              rm src/Symfony/Bridge/PhpUnit -Rf
               $PHPUNIT --exclude-group no-hhvm,benchmark,intl-data
           else
               echo "$COMPONENTS" | parallel --gnu "tfold {} $PHPUNIT_X {}"