diff --git a/.travis.yml b/.travis.yml
index 256dcf1..5d420e1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,3 +13,6 @@ matrix:
   fast_finish: true
   allow_failures:
     - php: hhvm-nightly
+
+install:
+  - composer install
diff --git a/composer.json b/composer.json
index 28145af..b6a376d 100644
--- a/composer.json
+++ b/composer.json
@@ -17,5 +17,13 @@
     },
     "autoload": {
         "psr-0": {"Parsedown": ""}
+    },
+    "autoload-dev": {
+        "psr-0": {
+            "TestParsedown": "test/",
+            "ParsedownTest": "test/",
+            "CommonMarkTest": "test/",
+            "CommonMarkTestWeak": "test/"
+        }
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index b2d5e9d..4fe3177 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="test/bootstrap.php" colors="true">
+<phpunit bootstrap="vendor/autoload.php" colors="true">
 	<testsuites>
 		<testsuite>
 			<file>test/ParsedownTest.php</file>
 		</testsuite>
 	</testsuites>
-</phpunit>
\ No newline at end of file
+</phpunit>
diff --git a/test/bootstrap.php b/test/bootstrap.php
deleted file mode 100644
index 76011c9..0000000
--- a/test/bootstrap.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-// prepare composer autoloader
-if (is_file(__DIR__ . '/../vendor/autoload.php')) {
-    // composer root package
-    require_once(__DIR__ . '/../vendor/autoload.php');
-} elseif (is_file(__DIR__ . '/../../../../vendor/autoload.php')) {
-    // composer dependency package
-    require_once(__DIR__ . '/../../../../vendor/autoload.php');
-} else {
-    die("Cannot find `vendor/autoload.php`. Run `composer install`.");
-}
-
-// load TestParsedown class
-if (!class_exists('TestParsedown', false) && is_file('test/TestParsedown.php')) {
-    require_once('test/TestParsedown.php');
-}