diff --git a/.travis.yml b/.travis.yml
index ab158b7..c6a74b9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,17 +6,9 @@ php:
   - 5.6
   - 7
   - hhvm
-  - hhvm-nightly
 
-matrix:
-  allow_failures:
-    - php: 7
-    - php: hhvm
-    - php: hhvm-nightly
-  fast_finish: true
-
-before_script:
-  - composer install --dev --prefer-source
+install:
+  - composer install --prefer-source --no-interaction
   
 script:
   - phpunit --coverage-text
diff --git a/composer.json b/composer.json
index bb3031e..56c6ec4 100644
--- a/composer.json
+++ b/composer.json
@@ -10,9 +10,7 @@
     "autoload": {
         "psr-4": { "React\\Cache\\": "src\\" }
     },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "0.5-dev"
-        }
+    "autoload-dev": {
+        "psr-4": { "React\\Tests\\Cache\\": "tests\\" }
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index cba6d4d..d02182f 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
+<phpunit colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="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 108d8e8..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\\Cache\\', __DIR__);