diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..ff72e2d0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/composer.lock
+/vendor
diff --git a/.travis.yml b/.travis.yml
index 3829bf1c..6e37033b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,8 +5,12 @@ php:
   - 5.5
   - 5.6
   - hhvm
+  - 7
 script:
-  - phpunit -c tests/unit/ --coverage-clover=coverage.clover
+  - phpunit --coverage-clover=coverage.clover
 after_script:
   - wget https://scrutinizer-ci.com/ocular.phar
   - php ocular.phar code-coverage:upload --format=php-clover coverage.clover
+tools:
+    external_code_coverage:
+        runs: 6
diff --git a/README.md b/README.md
index ea1fb6e8..98a83087 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ Finally, please note that this package is intended for use as a **dependency inj
 
 ### Installation
 
-This library requires PHP 5.3 or later, and has no userland dependencies.
+This library requires PHP 5.3 or later; we recommend using the latest available version of PHP as a matter of principle. It has no userland dependencies.
 
 It is installable and autoloadable via Composer as [aura/di](https://packagist.org/packages/aura/di).
 
@@ -38,9 +38,10 @@ Alternatively, [download a release](https://github.com/auraphp/Aura.Di/releases)
 [![Code Coverage](https://scrutinizer-ci.com/g/auraphp/Aura.Di/badges/coverage.png?b=develop-2)](https://scrutinizer-ci.com/g/auraphp/Aura.Di/)
 [![Build Status](https://travis-ci.org/auraphp/Aura.Di.png?branch=develop-2)](https://travis-ci.org/auraphp/Aura.Di)
 
-To run the unit tests at the command line, issue `phpunit -c tests/unit/`. (This requires [PHPUnit][] to be available as `phpunit`.)
+To run the unit tests at the command line, issue `phpunit` at the package root. (This requires [PHPUnit][] to be available as `phpunit` and [Composer][] to be available as `composer`.)
 
 [PHPUnit]: http://phpunit.de/manual/
+[Composer]: http://getcomposer.org/
 
 This library attempts to comply with [PSR-1][], [PSR-2][], and [PSR-4][]. If
 you notice compliance oversights, please send a patch via pull request.
diff --git a/composer.json b/composer.json
index 8a561288..abaebb2a 100644
--- a/composer.json
+++ b/composer.json
@@ -25,6 +25,11 @@
             "Aura\\Di\\": "src/"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "Aura\\Di\\": "tests/"
+        }
+    },
     "extra": {
         "aura": {
             "type": "library"
diff --git a/phpunit.php b/phpunit.php
new file mode 100644
index 00000000..ece7436a
--- /dev/null
+++ b/phpunit.php
@@ -0,0 +1,7 @@
+<?php
+error_reporting(E_ALL);
+$autoloader = __DIR__ . '/vendor/autoload.php';
+if (! file_exists($autoloader)) {
+    passthru('composer install');
+}
+require $autoloader;
diff --git a/tests/unit/phpunit.xml b/phpunit.xml.dist
similarity index 52%
rename from tests/unit/phpunit.xml
rename to phpunit.xml.dist
index a95f9621..761e67c4 100644
--- a/tests/unit/phpunit.xml
+++ b/phpunit.xml.dist
@@ -1,7 +1,7 @@
-<phpunit bootstrap="./bootstrap.php">
+<phpunit bootstrap="./phpunit.php">
     <testsuites>
         <testsuite>
-            <directory>./src</directory>
+            <directory>./tests</directory>
         </testsuite>
     </testsuites>
 </phpunit>
diff --git a/tests/container/src/AbstractContainerTest.php b/tests/AbstractContainerTest.php
similarity index 100%
rename from tests/container/src/AbstractContainerTest.php
rename to tests/AbstractContainerTest.php
diff --git a/tests/unit/src/ContainerBuilderTest.php b/tests/ContainerBuilderTest.php
similarity index 100%
rename from tests/unit/src/ContainerBuilderTest.php
rename to tests/ContainerBuilderTest.php
diff --git a/tests/container/src/ContainerTest.php b/tests/ContainerConfigTest.php
similarity index 91%
rename from tests/container/src/ContainerTest.php
rename to tests/ContainerConfigTest.php
index f53a62f6..85181c70 100644
--- a/tests/container/src/ContainerTest.php
+++ b/tests/ContainerConfigTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Aura\Di\_Config;
 
-class ContainerTest extends AbstractContainerTest
+class ContainerConfigTest extends AbstractContainerTest
 {
     protected function getConfigClasses()
     {
diff --git a/tests/unit/src/ContainerTest.php b/tests/ContainerTest.php
similarity index 100%
rename from tests/unit/src/ContainerTest.php
rename to tests/ContainerTest.php
diff --git a/tests/unit/src/FactoryTest.php b/tests/FactoryTest.php
similarity index 100%
rename from tests/unit/src/FactoryTest.php
rename to tests/FactoryTest.php
diff --git a/tests/unit/src/FakeChildClass.php b/tests/FakeChildClass.php
similarity index 100%
rename from tests/unit/src/FakeChildClass.php
rename to tests/FakeChildClass.php
diff --git a/tests/unit/src/FakeChildTrait.php b/tests/FakeChildTrait.php
similarity index 100%
rename from tests/unit/src/FakeChildTrait.php
rename to tests/FakeChildTrait.php
diff --git a/tests/unit/src/FakeClassWithParentTrait.php b/tests/FakeClassWithParentTrait.php
similarity index 100%
rename from tests/unit/src/FakeClassWithParentTrait.php
rename to tests/FakeClassWithParentTrait.php
diff --git a/tests/unit/src/FakeClassWithTrait.php b/tests/FakeClassWithTrait.php
similarity index 100%
rename from tests/unit/src/FakeClassWithTrait.php
rename to tests/FakeClassWithTrait.php
diff --git a/tests/unit/src/FakeGrandchildTrait.php b/tests/FakeGrandchildTrait.php
similarity index 100%
rename from tests/unit/src/FakeGrandchildTrait.php
rename to tests/FakeGrandchildTrait.php
diff --git a/tests/unit/src/FakeInterface.php b/tests/FakeInterface.php
similarity index 100%
rename from tests/unit/src/FakeInterface.php
rename to tests/FakeInterface.php
diff --git a/tests/unit/src/FakeInterfaceClass.php b/tests/FakeInterfaceClass.php
similarity index 100%
rename from tests/unit/src/FakeInterfaceClass.php
rename to tests/FakeInterfaceClass.php
diff --git a/tests/unit/src/FakeInterfaceClass1.php b/tests/FakeInterfaceClass1.php
similarity index 100%
rename from tests/unit/src/FakeInterfaceClass1.php
rename to tests/FakeInterfaceClass1.php
diff --git a/tests/unit/src/FakeInterfaceClass2.php b/tests/FakeInterfaceClass2.php
similarity index 100%
rename from tests/unit/src/FakeInterfaceClass2.php
rename to tests/FakeInterfaceClass2.php
diff --git a/tests/unit/src/FakeInterfaceClass3.php b/tests/FakeInterfaceClass3.php
similarity index 100%
rename from tests/unit/src/FakeInterfaceClass3.php
rename to tests/FakeInterfaceClass3.php
diff --git a/tests/unit/src/FakeLibraryConfig.php b/tests/FakeLibraryConfig.php
similarity index 100%
rename from tests/unit/src/FakeLibraryConfig.php
rename to tests/FakeLibraryConfig.php
diff --git a/tests/unit/src/FakeOtherClass.php b/tests/FakeOtherClass.php
similarity index 100%
rename from tests/unit/src/FakeOtherClass.php
rename to tests/FakeOtherClass.php
diff --git a/tests/unit/src/FakeParamsClass.php b/tests/FakeParamsClass.php
similarity index 100%
rename from tests/unit/src/FakeParamsClass.php
rename to tests/FakeParamsClass.php
diff --git a/tests/unit/src/FakeParentClass.php b/tests/FakeParentClass.php
similarity index 100%
rename from tests/unit/src/FakeParentClass.php
rename to tests/FakeParentClass.php
diff --git a/tests/unit/src/FakeProjectConfig.php b/tests/FakeProjectConfig.php
similarity index 100%
rename from tests/unit/src/FakeProjectConfig.php
rename to tests/FakeProjectConfig.php
diff --git a/tests/unit/src/FakeResolveClass.php b/tests/FakeResolveClass.php
similarity index 100%
rename from tests/unit/src/FakeResolveClass.php
rename to tests/FakeResolveClass.php
diff --git a/tests/unit/src/FakeTrait.php b/tests/FakeTrait.php
similarity index 100%
rename from tests/unit/src/FakeTrait.php
rename to tests/FakeTrait.php
diff --git a/tests/unit/src/InstanceFactoryTest.php b/tests/InstanceFactoryTest.php
similarity index 100%
rename from tests/unit/src/InstanceFactoryTest.php
rename to tests/InstanceFactoryTest.php
diff --git a/tests/unit/src/SerializationTest.php b/tests/SerializationTest.php
similarity index 100%
rename from tests/unit/src/SerializationTest.php
rename to tests/SerializationTest.php
diff --git a/tests/container/bootstrap.php b/tests/container/bootstrap.php
deleted file mode 100644
index e142b596..00000000
--- a/tests/container/bootstrap.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-// turn on all errors
-error_reporting(E_ALL);
-
-// autoloader
-require dirname(dirname(__DIR__)) . '/autoload.php';
-
-// default globals
-if (is_readable(__DIR__ . '/globals.dist.php')) {
-    require __DIR__ . '/globals.dist.php';
-}
-
-// override globals
-if (is_readable(__DIR__ . '/globals.php')) {
-    require __DIR__ . '/globals.php';
-}
diff --git a/tests/container/phpunit.sh b/tests/container/phpunit.sh
deleted file mode 100755
index aae18c29..00000000
--- a/tests/container/phpunit.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-phpunit $@
-exit $?
diff --git a/tests/container/phpunit.xml b/tests/container/phpunit.xml
deleted file mode 100644
index a95f9621..00000000
--- a/tests/container/phpunit.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<phpunit bootstrap="./bootstrap.php">
-    <testsuites>
-        <testsuite>
-            <directory>./src</directory>
-        </testsuite>
-    </testsuites>
-</phpunit>
diff --git a/tests/unit/src/lazy_array.php b/tests/lazy_array.php
similarity index 100%
rename from tests/unit/src/lazy_array.php
rename to tests/lazy_array.php
diff --git a/tests/unit/bootstrap.php b/tests/unit/bootstrap.php
deleted file mode 100644
index e142b596..00000000
--- a/tests/unit/bootstrap.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-// turn on all errors
-error_reporting(E_ALL);
-
-// autoloader
-require dirname(dirname(__DIR__)) . '/autoload.php';
-
-// default globals
-if (is_readable(__DIR__ . '/globals.dist.php')) {
-    require __DIR__ . '/globals.dist.php';
-}
-
-// override globals
-if (is_readable(__DIR__ . '/globals.php')) {
-    require __DIR__ . '/globals.php';
-}