diff --git a/.travis.yml b/.travis.yml
index 5d6c2159a6..fc26dc6491 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -151,6 +151,7 @@ before_install:
           INI=~/.phpenv/versions/$PHP/etc/conf.d/travis.ini
           echo date.timezone = Europe/Paris >> $INI
           echo memory_limit = -1 >> $INI
+          echo default_socket_timeout = 10 >> $INI
           echo session.gc_probability = 0 >> $INI
           echo opcache.enable_cli = 1 >> $INI
           echo apc.enable_cli = 1 >> $INI
diff --git a/src/Symfony/Component/HttpClient/Tests/DataCollector/HttpClientDataCollectorTest.php b/src/Symfony/Component/HttpClient/Tests/DataCollector/HttpClientDataCollectorTest.php
index d173c17250..b578710546 100755
--- a/src/Symfony/Component/HttpClient/Tests/DataCollector/HttpClientDataCollectorTest.php
+++ b/src/Symfony/Component/HttpClient/Tests/DataCollector/HttpClientDataCollectorTest.php
@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+namespace Symfony\Component\HttpClient\Tests\DataCollector;
+
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpClient\DataCollector\HttpClientDataCollector;
 use Symfony\Component\HttpClient\NativeHttpClient;
@@ -19,9 +21,13 @@ use Symfony\Contracts\HttpClient\Test\TestHttpServer;
 
 class HttpClientDataCollectorTest extends TestCase
 {
-    public function testItCollectsRequestCount()
+    public static function setUpBeforeClass(): void
     {
         TestHttpServer::start();
+    }
+
+    public function testItCollectsRequestCount()
+    {
         $httpClient1 = $this->httpClientThatHasTracedRequests([
             [
                 'method' => 'GET',
@@ -50,7 +56,6 @@ class HttpClientDataCollectorTest extends TestCase
 
     public function testItCollectsErrorCount()
     {
-        TestHttpServer::start();
         $httpClient1 = $this->httpClientThatHasTracedRequests([
             [
                 'method' => 'GET',
@@ -80,7 +85,6 @@ class HttpClientDataCollectorTest extends TestCase
 
     public function testItCollectsErrorCountByClient()
     {
-        TestHttpServer::start();
         $httpClient1 = $this->httpClientThatHasTracedRequests([
             [
                 'method' => 'GET',
@@ -113,7 +117,6 @@ class HttpClientDataCollectorTest extends TestCase
 
     public function testItCollectsTracesByClient()
     {
-        TestHttpServer::start();
         $httpClient1 = $this->httpClientThatHasTracedRequests([
             [
                 'method' => 'GET',
@@ -146,7 +149,6 @@ class HttpClientDataCollectorTest extends TestCase
 
     public function testItIsEmptyAfterReset()
     {
-        TestHttpServer::start();
         $httpClient1 = $this->httpClientThatHasTracedRequests([
             [
                 'method' => 'GET',
diff --git a/src/Symfony/Component/HttpClient/Tests/HttplugClientTest.php b/src/Symfony/Component/HttpClient/Tests/HttplugClientTest.php
index 66a8cef6e7..6a8cadbbc8 100644
--- a/src/Symfony/Component/HttpClient/Tests/HttplugClientTest.php
+++ b/src/Symfony/Component/HttpClient/Tests/HttplugClientTest.php
@@ -22,8 +22,6 @@ use Symfony\Contracts\HttpClient\Test\TestHttpServer;
 
 class HttplugClientTest extends TestCase
 {
-    private static $server;
-
     public static function setUpBeforeClass(): void
     {
         TestHttpServer::start();
diff --git a/src/Symfony/Component/HttpClient/Tests/Psr18ClientTest.php b/src/Symfony/Component/HttpClient/Tests/Psr18ClientTest.php
index 42e627b590..1ef36fc5bd 100644
--- a/src/Symfony/Component/HttpClient/Tests/Psr18ClientTest.php
+++ b/src/Symfony/Component/HttpClient/Tests/Psr18ClientTest.php
@@ -21,8 +21,6 @@ use Symfony\Contracts\HttpClient\Test\TestHttpServer;
 
 class Psr18ClientTest extends TestCase
 {
-    private static $server;
-
     public static function setUpBeforeClass(): void
     {
         TestHttpServer::start();
diff --git a/src/Symfony/Contracts/HttpClient/Test/TestHttpServer.php b/src/Symfony/Contracts/HttpClient/Test/TestHttpServer.php
index 0adb1a52a3..cfc100d80c 100644
--- a/src/Symfony/Contracts/HttpClient/Test/TestHttpServer.php
+++ b/src/Symfony/Contracts/HttpClient/Test/TestHttpServer.php
@@ -19,12 +19,12 @@ use Symfony\Component\Process\Process;
  */
 class TestHttpServer
 {
-    private static $started;
+    private static $process;
 
     public static function start()
     {
-        if (self::$started) {
-            return;
+        if (self::$process) {
+            self::$process->stop();
         }
 
         $finder = new PhpExecutableFinder();
@@ -32,9 +32,10 @@ class TestHttpServer
         $process->setWorkingDirectory(__DIR__.'/Fixtures/web');
         $process->start();
 
-        register_shutdown_function([$process, 'stop']);
-        sleep('\\' === \DIRECTORY_SEPARATOR ? 10 : 1);
+        do {
+            usleep(50000);
+        } while (!@fopen('http://127.0.0.1:8057/', 'r'));
 
-        self::$started = true;
+        self::$process = $process;
     }
 }