diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/DeprecationTest.php b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/DeprecationTest.php
index 583cca22f4..0c8708bb35 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/DeprecationTest.php
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/DeprecationTest.php
@@ -26,6 +26,12 @@ class DeprecationTest extends TestCase
 
     public function testItCanTellWhetherItIsInternal()
     {
+        $r = new \ReflectionClass(Deprecation::class);
+
+        if (dirname($r->getFileName(), 2) !== dirname(__DIR__, 2)) {
+            $this->markTestSkipped('Test case is not compatible with having the bridge in vendor/');
+        }
+
         $deprecation = new Deprecation('💩', $this->debugBacktrace(), __FILE__);
         $this->assertSame(Deprecation::TYPE_SELF, $deprecation->getType());
     }
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/disabled.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/disabled.phpt
index a55e88d1a8..0115bbd242 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/disabled.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/disabled.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test DeprecationErrorHandler in disabled mode
+Test DeprecationErrorHandler in weak mode
 --FILE--
 <?php
 
-$_SERVER['SYMFONY_DEPRECATIONS_HELPER'] = 'disabled';
+putenv('SYMFONY_DEPRECATIONS_HELPER=disabled');
 putenv('ANSICON');
 putenv('ConEmuANSI');
 putenv('TERM');
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/disabled_from_env_superglobal.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/disabled_from_env_superglobal.phpt
deleted file mode 100644
index aae7bd44f5..0000000000
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/disabled_from_env_superglobal.phpt
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-Test DeprecationErrorHandler in disabled mode (via putenv)
---FILE--
-<?php
-
-$_ENV['SYMFONY_DEPRECATIONS_HELPER'] = 'disabled';
-putenv('ANSICON');
-putenv('ConEmuANSI');
-putenv('TERM');
-
-$vendor = __DIR__;
-while (!file_exists($vendor.'/vendor')) {
-    $vendor = dirname($vendor);
-}
-define('PHPUNIT_COMPOSER_INSTALL', $vendor.'/vendor/autoload.php');
-require PHPUNIT_COMPOSER_INSTALL;
-require_once __DIR__.'/../../bootstrap.php';
-
-echo (int) set_error_handler('var_dump');
-echo (int) class_exists('Symfony\Bridge\PhpUnit\DeprecationErrorHandler', false);
-
-?>
---EXPECTF--
-00
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/disabled_from_putenv.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/disabled_from_putenv.phpt
deleted file mode 100644
index 73a67241a4..0000000000
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/disabled_from_putenv.phpt
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-Test DeprecationErrorHandler in disabled mode (via putenv)
---FILE--
-<?php
-
-putenv('SYMFONY_DEPRECATIONS_HELPER=disabled');
-putenv('ANSICON');
-putenv('ConEmuANSI');
-putenv('TERM');
-
-$vendor = __DIR__;
-while (!file_exists($vendor.'/vendor')) {
-    $vendor = dirname($vendor);
-}
-define('PHPUNIT_COMPOSER_INSTALL', $vendor.'/vendor/autoload.php');
-require PHPUNIT_COMPOSER_INSTALL;
-require_once __DIR__.'/../../bootstrap.php';
-
-echo (int) set_error_handler('var_dump');
-echo (int) class_exists('Symfony\Bridge\PhpUnit\DeprecationErrorHandler', false);
-
-?>
---EXPECTF--
-00