diff --git a/.travis.yml b/.travis.yml
index 4cfe693..debd056 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,5 +3,4 @@ php:
   - "5.4"
   - "5.3"
 before_script:
-  - git clone git://github.com/phpseclib/phpseclib.git phpseclib
-  - mv phpseclib/phpseclib/* ./
+  - composer install --prefer-source --dev
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..a310173
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,24 @@
+{
+  "name": "singpolyma/openpgp-php",
+  "description": "Pure-PHP implementation of the OpenPGP Message Format (RFC 4880)",
+  "license": "Unlicense",
+  "authors": [
+    {
+      "name": "Arto Bendiken",
+      "email": "arto.bendiken@gmail.com"
+    },
+    {
+      "name": "Stephen Paul Weber",
+      "email": "singpolyma@singpolyma.net"
+    }
+  ],
+  "require": {
+    "phpseclib/phpseclib": "~0.3"
+  },
+  "require-dev": {
+    "phpunit/phpunit": "~4.0"
+  },
+  "autoload": {
+    "classmap": ["lib/"]
+  }
+}
diff --git a/phpunit.xml b/phpunit.xml
index a071d34..a38403e 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,4 +1,4 @@
-<phpunit>
+<phpunit bootstrap="tests/bootstrap.php">
   <testsuites>
     <testsuite name="Serialization">
       <file>tests/suite.php</file>
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
new file mode 100644
index 0000000..9635a9c
--- /dev/null
+++ b/tests/bootstrap.php
@@ -0,0 +1,2 @@
+<?php
+@include_once dirname(__FILE__) . '/../vendor/autoload.php';