diff --git a/composer.json b/composer.json
index a38af56..a7bf49b 100644
--- a/composer.json
+++ b/composer.json
@@ -13,6 +13,9 @@
     "autoload": {
         "psr-4": { "Clue\\React\\Ssdp\\": "src/" }
     },
+    "autoload-dev": {
+        "psr-4": { "Clue\\Tests\\React\\Ssdp\\": "tests/" }
+    },
     "require": {
         "php": ">=5.3",
         "clue/multicast-react": "^1.0 || ^0.2",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index f497a5b..15d4daf 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit bootstrap="tests/bootstrap.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
->
+<phpunit bootstrap="vendor/autoload.php" colors="true">
     <testsuites>
         <testsuite name="SSDP Test Suite">
             <directory>./tests/</directory>
diff --git a/tests/ClientTest.php b/tests/ClientTest.php
index cfca429..e008095 100644
--- a/tests/ClientTest.php
+++ b/tests/ClientTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\React\Ssdp;
+
 use Clue\React\Ssdp\Client;
 use React\EventLoop\Factory;
 
@@ -37,7 +39,7 @@ interface_exists('React\EventLoop\TimerInterface') ? 'React\EventLoop\TimerInter
 
         $this->assertInstanceOf('React\Promise\PromiseInterface', $promise);
 
-        if (!($promise instanceof React\Promise\CancellablePromiseInterface)) {
+        if (!($promise instanceof \React\Promise\CancellablePromiseInterface)) {
             $this->markTestSkipped();
         }
 
diff --git a/tests/bootstrap.php b/tests/TestCase.php
similarity index 85%
rename from tests/bootstrap.php
rename to tests/TestCase.php
index 156599d..ba5e48f 100644
--- a/tests/bootstrap.php
+++ b/tests/TestCase.php
@@ -1,8 +1,8 @@
 <?php
 
-require __DIR__ . '/../vendor/autoload.php';
+namespace Clue\Tests\React\Ssdp;
 
-class TestCase extends PHPUnit\Framework\TestCase
+class TestCase extends \PHPUnit\Framework\TestCase
 {
     protected function expectCallableOnce()
     {