diff --git a/composer.json b/composer.json
index 216d008..3667c6b 100644
--- a/composer.json
+++ b/composer.json
@@ -50,6 +50,9 @@
             "dev-master": "3.0.x-dev"
         }
     },
+    "autoload-dev": {
+        "psr-4": {"Ramsey\\Uuid\\Test\\": "tests/src/"}
+    },
     "replace": {
         "rhumsaa/uuid": "self.version"
     }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index dc63149..fe01ccd 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./tests/bootstrap.php" colors="true">
+<phpunit bootstrap="./vendor/autoload.php" colors="true">
     <testsuites>
         <testsuite>
-            <directory>./tests</directory>
+            <directory>./tests/src</directory>
         </testsuite>
     </testsuites>
     <filter>
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
deleted file mode 100644
index 7998a23..0000000
--- a/tests/bootstrap.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-error_reporting(E_ALL | E_STRICT);
-date_default_timezone_set('UTC');
-
-// Ensure that composer has installed all dependencies
-if (!file_exists(dirname(__DIR__) . '/vendor/autoload.php')) {
-    die("Dependencies must be installed using composer:\n\nphp composer.phar install --dev\n\n"
-        . "See http://getcomposer.org for help with installing composer\n");
-}
-
-// Include the Composer autoloader
-$loader = include realpath(dirname(__FILE__) . '/../vendor/autoload.php');
-$loader->addPsr4('Ramsey\\Uuid\\', __DIR__);
diff --git a/tests/Converter/Number/DegradedNumberConverterTest.php b/tests/src/Converter/Number/DegradedNumberConverterTest.php
similarity index 80%
rename from tests/Converter/Number/DegradedNumberConverterTest.php
rename to tests/src/Converter/Number/DegradedNumberConverterTest.php
index 21c6def..a9a2a44 100644
--- a/tests/Converter/Number/DegradedNumberConverterTest.php
+++ b/tests/src/Converter/Number/DegradedNumberConverterTest.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace Ramsey\Uuid\Converter\Number;
+namespace Ramsey\Uuid\Test\Converter\Number;
 
-use Ramsey\Uuid\TestCase;
+use Ramsey\Uuid\Test\TestCase;
+use Ramsey\Uuid\Converter\Number\DegradedNumberConverter;
 
 class DegradedNumberConverterTest extends TestCase
 {
diff --git a/tests/Generator/RandomGeneratorFactoryTest.php b/tests/src/Generator/RandomGeneratorFactoryTest.php
similarity index 86%
rename from tests/Generator/RandomGeneratorFactoryTest.php
rename to tests/src/Generator/RandomGeneratorFactoryTest.php
index 9a3ceb7..0d92660 100644
--- a/tests/Generator/RandomGeneratorFactoryTest.php
+++ b/tests/src/Generator/RandomGeneratorFactoryTest.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace Ramsey\Uuid\Generator;
+namespace Ramsey\Uuid\Test\Generator;
 
-use Ramsey\Uuid\TestCase;
+use Ramsey\Uuid\Test\TestCase;
+use Ramsey\Uuid\Generator\RandomGeneratorFactory;
 
 class RandomGeneratorFactoryTest extends TestCase
 {
diff --git a/tests/TestCase.php b/tests/src/TestCase.php
similarity index 97%
rename from tests/TestCase.php
rename to tests/src/TestCase.php
index 145c2a8..5be937f 100644
--- a/tests/TestCase.php
+++ b/tests/src/TestCase.php
@@ -1,5 +1,5 @@
 <?php
-namespace Ramsey\Uuid;
+namespace Ramsey\Uuid\Test;
 
 class TestCase extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/UuidBcTag1_1_2Test.php b/tests/src/UuidBcTag1_1_2Test.php
similarity index 100%
rename from tests/UuidBcTag1_1_2Test.php
rename to tests/src/UuidBcTag1_1_2Test.php
diff --git a/tests/UuidFactoryTest.php b/tests/src/UuidFactoryTest.php
similarity index 87%
rename from tests/UuidFactoryTest.php
rename to tests/src/UuidFactoryTest.php
index 62ac35b..a232b3c 100644
--- a/tests/UuidFactoryTest.php
+++ b/tests/src/UuidFactoryTest.php
@@ -1,6 +1,9 @@
 <?php
 
-namespace Ramsey\Uuid;
+namespace Ramsey\Uuid\Test;
+
+use Ramsey\Uuid\FeatureSet;
+use Ramsey\Uuid\UuidFactory;
 
 class UuidFactoryTest extends TestCase
 {
diff --git a/tests/UuidTest.php b/tests/src/UuidTest.php
similarity index 99%
rename from tests/UuidTest.php
rename to tests/src/UuidTest.php
index 09b4cdd..7b0ae15 100644
--- a/tests/UuidTest.php
+++ b/tests/src/UuidTest.php
@@ -1,11 +1,14 @@
 <?php
 
-namespace Ramsey\Uuid;
+namespace Ramsey\Uuid\Test;
 
+use Ramsey\Uuid\FeatureSet;
 use Ramsey\Uuid\Provider\Time\SystemTimeProvider;
 use Ramsey\Uuid\Provider\Time\FixedTimeProvider;
 use Ramsey\Uuid\Generator\CombGenerator;
 use Ramsey\Uuid\Generator\RandomGeneratorFactory;
+use Ramsey\Uuid\Uuid;
+use Ramsey\Uuid\UuidFactory;
 
 class UuidTest extends TestCase
 {