diff --git a/composer.json b/composer.json
index ef5f7770f2f..dcbfb359e6d 100644
--- a/composer.json
+++ b/composer.json
@@ -37,6 +37,9 @@
     "autoload": {
         "psr-4": { "Github\\": "lib/Github/" }
     },
+    "autoload-dev": {
+        "psr-4": { "Github\\Tests\\": "test/Github/Tests/"}
+    },
     "minimum-stability": "dev",
     "prefer-stable": true,
     "extra": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 0f71eb3983d..c390af0e017 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -9,7 +9,7 @@
          processIsolation="false"
          stopOnFailure="false"
          syntaxCheck="false"
-         bootstrap="test/bootstrap.php"
+         bootstrap="vendor/autoload.php"
 >
     <testsuites>
         <testsuite name="php-github-api Test Suite">
diff --git a/test/bootstrap.php b/test/bootstrap.php
deleted file mode 100644
index 416d08990eb..00000000000
--- a/test/bootstrap.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-function includeIfExists($file)
-{
-    if (file_exists($file)) {
-        return include $file;
-    }
-}
-
-if ((!$loader = includeIfExists(__DIR__.'/../vendor/autoload.php')) && (!$loader = includeIfExists(__DIR__.'/../../../.composer/autoload.php'))) {
-    die('You must set up the project dependencies, run the following commands:'.PHP_EOL.
-        'curl -s http://getcomposer.org/installer | php'.PHP_EOL.
-        'php composer.phar install'.PHP_EOL);
-}
-
-$loader->add('Github\Tests', __DIR__);
-
-return $loader;