diff --git a/.travis.yml b/.travis.yml
index 2715358..364429b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,5 @@
 language: php
 
-php:
-# - 5.3 # requires old distro
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - 7.1
-  - 7.2
-  - 7.3
-  - 7.4
-  - nightly # ignore errors, see below
-  - hhvm # ignore errors, see below
-
 # lock distro so new future defaults will not break the build
 dist: trusty
 
@@ -20,9 +7,21 @@ matrix:
   include:
     - php: 5.3
       dist: precise
+    - php: 5.4
+    - php: 5.5
+    - php: 5.6
+    - php: 7.0
+    - php: 7.1
+    - php: 7.2
+    - php: 7.3
+    - php: 7.4
+    - php: nightly
+    - php: hhvm-3.18
+      install:
+        - composer require phpunit/phpunit:^5 --dev --no-interaction # requires legacy phpunit
   allow_failures:
     - php: nightly
-    - php: hhvm
+    - php: hhvm-3.18
 
 install:
   - composer install --no-interaction
diff --git a/composer.json b/composer.json
index 673e61c..9207639 100644
--- a/composer.json
+++ b/composer.json
@@ -21,5 +21,10 @@
         "psr-4": {
             "React\\HttpClient\\": "src"
         }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "React\\Tests\\HttpClient\\": "tests"
+        }
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 79c0ee6..04d426b 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -8,7 +8,7 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         bootstrap="tests/bootstrap.php"
+         bootstrap="vendor/autoload.php"
 >
     <testsuites>
         <testsuite name="React Test Suite">
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
deleted file mode 100644
index e3bed44..0000000
--- a/tests/bootstrap.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-$loader = @include __DIR__ . '/../vendor/autoload.php';
-if (!$loader) {
-    $loader = require __DIR__ . '/../../../../vendor/autoload.php';
-}
-$loader->addPsr4('React\\Tests\\HttpClient\\', __DIR__);