diff --git a/.travis.yml b/.travis.yml
index f7c3ebe6..5df24097 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ before_script:
   - composer install --dev --prefer-source
 
 script:
-  - phpunit
+  - ./vendor/bin/phpunit
   - ./vendor/bin/phpdoc
 
 deploy:
diff --git a/composer.json b/composer.json
index acd6297f..38f82e4b 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,14 @@
     "description": "PHP development kit for prismic.io",
 
     "autoload": {
-        "psr-0": { "": "src/" }
+        "psr-4": {
+            "Prismic\\": "src/Prismic"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Prismic\\Test\\": "tests/Prismic"
+        }
     },
 
     "license": "Apache 2 license",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index d8c23f65..025eed98 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit bootstrap="./tests/bootstrap.php" colors="true">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         colors="true">
     <testsuites>
         <testsuite name="Prismic PHP SDK Test Suite">
             <directory suffix="Test.php">./tests/Prismic/</directory>
diff --git a/tests/autoload.php.dist b/tests/autoload.php.dist
deleted file mode 100644
index bd53592a..00000000
--- a/tests/autoload.php.dist
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-$autoload = __DIR__.'/../vendor/autoload.php';
-
-if (is_file($autoload)) {
-    include $autoload;
-} else {
-    die('Unable to find autoload.php file, please use composer to load dependencies:
-
-wget http://getcomposer.org/composer.phar
-php composer.phar install
-
-Visit http://getcomposer.org/ for more information.
-
-');
-}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
deleted file mode 100644
index 4ef469fa..00000000
--- a/tests/bootstrap.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-if (file_exists($file = __DIR__.'/autoload.php')) {
-    require_once $file;
-} elseif (file_exists($file = __DIR__.'/autoload.php.dist')) {
-    require_once $file;
-}
-
-if (ini_get('date.timezone') == null) {
-  date_default_timezone_set('UTC');
-}
-
-require_once 'Prismic/FakeLinkResolver.php';