diff --git a/README.md b/README.md
index 8762293..d16e852 100644
--- a/README.md
+++ b/README.md
@@ -149,7 +149,7 @@ Unit Tests
 
 Setup the test suite using Composer:
 
-    $ composer install --dev
+    $ composer install
 
 Run it using PHPUnit:
 
diff --git a/composer.json b/composer.json
index f89b861..b6c1cc2 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,10 @@
         "php": ">=5.3.0"
     },
     "autoload": {
-        "psr-0": { "EmailReplyParser": "src/" }
+        "psr-4": { "EmailReplyParser\\": "src/EmailReplyParser" }
+    },
+    "autoload-dev": {
+        "psr-4": { "EmailReplyParser\\Tests\\": "tests/EmailReplyParser/Tests" }
     },
     "extra": {
         "branch-alias": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index abcaf3e..d191896 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -8,7 +8,7 @@
     processIsolation="false"
     stopOnFailure="false"
     syntaxCheck="false"
-    bootstrap="tests/bootstrap.php"
+    bootstrap="vendor/autoload.php"
     >
     <testsuites>
         <testsuite name="EmailReplyParser Test Suite">
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
deleted file mode 100644
index a3165db..0000000
--- a/tests/bootstrap.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$loader = require_once __DIR__ . '/../vendor/autoload.php';
-$loader->add('EmailReplyParser\Tests', __DIR__);