diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..0925d33
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,6 @@
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.travis.yml export-ignore
+/examples/ export-ignore
+/phpunit.xml.dist export-ignore
+/tests/ export-ignore
diff --git a/composer.json b/composer.json
index 27caca6..50372f9 100644
--- a/composer.json
+++ b/composer.json
@@ -13,6 +13,9 @@
     "autoload": {
         "files": [ "src/functions_include.php" ]
     },
+    "autoload-dev": {
+        "psr-4": { "Clue\\Tests\\React\\Block\\": "tests/" }
+    },
     "require": {
     	"php": ">=5.3",
         "react/event-loop": "^1.0 || ^0.5 || ^0.4 || ^0.3.5",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index e29d977..40b9570 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="Block React Test Suite">
             <directory>./tests/</directory>
@@ -16,4 +11,4 @@
             <directory>./src/</directory>
         </whitelist>
     </filter>
-</phpunit>
\ No newline at end of file
+</phpunit>
diff --git a/tests/FunctionAwaitAllTest.php b/tests/FunctionAwaitAllTest.php
index f445e77..13cf58b 100644
--- a/tests/FunctionAwaitAllTest.php
+++ b/tests/FunctionAwaitAllTest.php
@@ -1,8 +1,10 @@
 <?php
 
-use Clue\React\Block;
+namespace Clue\Tests\React\Block;
+
 use React\Promise;
 use React\Promise\Timer\TimeoutException;
+use Clue\React\Block;
 
 class FunctionAwaitAllTest extends TestCase
 {
@@ -29,7 +31,7 @@ public function testAwaitAllRejected()
     {
         $all = array(
             $this->createPromiseResolved(1),
-            $this->createPromiseRejected(new Exception('test'))
+            $this->createPromiseRejected(new \Exception('test'))
         );
 
         Block\awaitAll($all, $this->loop);
@@ -55,8 +57,8 @@ public function testAwaitAllRejectedWithFalseWillWrapInUnexpectedValueException(
     public function testAwaitAllOnlyRejected()
     {
         $all = array(
-            $this->createPromiseRejected(new Exception('first')),
-            $this->createPromiseRejected(new Exception('second'))
+            $this->createPromiseRejected(new \Exception('first')),
+            $this->createPromiseRejected(new \Exception('second'))
         );
 
         Block\awaitAll($all, $this->loop);
@@ -78,14 +80,14 @@ public function testAwaitAllWithRejectedWillCancelPending()
         });
 
         $all = array(
-            Promise\reject(new Exception('test')),
+            Promise\reject(new \Exception('test')),
             $promise
         );
 
         try {
             Block\awaitAll($all, $this->loop);
             $this->fail();
-        } catch (Exception $expected) {
+        } catch (\Exception $expected) {
             $this->assertEquals('test', $expected->getMessage());
             $this->assertTrue($cancelled);
         }
@@ -117,11 +119,11 @@ public function testAwaitAllPendingPromiseWithTimeoutAndCancellerShouldNotCreate
         gc_collect_cycles();
 
         $promise = new \React\Promise\Promise(function () { }, function () {
-            throw new RuntimeException();
+            throw new \RuntimeException();
         });
         try {
             Block\awaitAll(array($promise), $this->loop, 0.001);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             // no-op
         }
         unset($promise, $e);
diff --git a/tests/FunctionAwaitAnyTest.php b/tests/FunctionAwaitAnyTest.php
index 37298a2..a9a0d35 100644
--- a/tests/FunctionAwaitAnyTest.php
+++ b/tests/FunctionAwaitAnyTest.php
@@ -1,9 +1,11 @@
 <?php
 
-use Clue\React\Block;
+namespace Clue\Tests\React\Block;
+
 use React\Promise\Deferred;
 use React\Promise;
 use React\Promise\Timer\TimeoutException;
+use Clue\React\Block;
 
 class FunctionAwaitAnyTest extends TestCase
 {
@@ -110,11 +112,11 @@ public function testAwaitAnyPendingPromiseWithTimeoutAndCancellerShouldNotCreate
         gc_collect_cycles();
 
         $promise = new \React\Promise\Promise(function () { }, function () {
-            throw new RuntimeException();
+            throw new \RuntimeException();
         });
         try {
             Block\awaitAny(array($promise), $this->loop, 0.001);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             // no-op
         }
         unset($promise, $e);
diff --git a/tests/FunctionAwaitTest.php b/tests/FunctionAwaitTest.php
index a22753c..d9d40f8 100644
--- a/tests/FunctionAwaitTest.php
+++ b/tests/FunctionAwaitTest.php
@@ -1,8 +1,10 @@
 <?php
 
-use Clue\React\Block;
+namespace Clue\Tests\React\Block;
+
 use React\Promise;
 use React\Promise\Timer\TimeoutException;
+use Clue\React\Block;
 
 class FunctionAwaitTest extends TestCase
 {
@@ -12,7 +14,7 @@ class FunctionAwaitTest extends TestCase
      */
     public function testAwaitOneRejected()
     {
-        $promise = $this->createPromiseRejected(new Exception('test'));
+        $promise = $this->createPromiseRejected(new \Exception('test'));
 
         Block\await($promise, $this->loop);
     }
@@ -44,12 +46,12 @@ public function testAwaitOneRejectedWithNullWillWrapInUnexpectedValueException()
      */
     public function testAwaitOneRejectedWithPhp7ErrorWillWrapInUnexpectedValueExceptionWithPrevious()
     {
-        $promise = Promise\reject(new Error('Test'));
+        $promise = Promise\reject(new \Error('Test'));
 
         try {
             Block\await($promise, $this->loop);
             $this->fail();
-        } catch (UnexpectedValueException $e) {
+        } catch (\UnexpectedValueException $e) {
             $this->assertEquals('Promise rejected with unexpected value of type Error', $e->getMessage());
             $this->assertInstanceOf('Throwable', $e->getPrevious());
             $this->assertEquals('Test', $e->getPrevious()->getMessage());
@@ -130,10 +132,10 @@ public function testAwaitOneRejectedShouldNotCreateAnyGarbageReferences()
 
         gc_collect_cycles();
 
-        $promise = Promise\reject(new RuntimeException());
+        $promise = Promise\reject(new \RuntimeException());
         try {
             Block\await($promise, $this->loop);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             // no-op
         }
         unset($promise, $e);
@@ -149,10 +151,10 @@ public function testAwaitOneRejectedWithTimeoutShouldNotCreateAnyGarbageReferenc
 
         gc_collect_cycles();
 
-        $promise = Promise\reject(new RuntimeException());
+        $promise = Promise\reject(new \RuntimeException());
         try {
             Block\await($promise, $this->loop, 0.001);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             // no-op
         }
         unset($promise, $e);
@@ -171,7 +173,7 @@ public function testAwaitNullValueShouldNotCreateAnyGarbageReferences()
         $promise = Promise\reject(null);
         try {
             Block\await($promise, $this->loop);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             // no-op
         }
         unset($promise, $e);
@@ -191,11 +193,11 @@ public function testAwaitPendingPromiseWithTimeoutAndCancellerShouldNotCreateAny
         gc_collect_cycles();
 
         $promise = new \React\Promise\Promise(function () { }, function () {
-            throw new RuntimeException();
+            throw new \RuntimeException();
         });
         try {
             Block\await($promise, $this->loop, 0.001);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             // no-op
         }
         unset($promise, $e);
@@ -213,7 +215,7 @@ public function testAwaitPendingPromiseWithTimeoutAndWithoutCancellerShouldNotCr
         $promise = new \React\Promise\Promise(function () { });
         try {
             Block\await($promise, $this->loop, 0.001);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             // no-op
         }
         unset($promise, $e);
@@ -233,7 +235,7 @@ public function testAwaitPendingPromiseWithTimeoutAndNoOpCancellerShouldNotCreat
         });
         try {
             Block\await($promise, $this->loop, 0.001);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             // no-op
         }
         unset($promise, $e);
diff --git a/tests/FunctionSleepTest.php b/tests/FunctionSleepTest.php
index 074ae59..259f2ed 100644
--- a/tests/FunctionSleepTest.php
+++ b/tests/FunctionSleepTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\React\Block;
+
 use Clue\React\Block;
 
 class FunctionSleepTest extends TestCase
diff --git a/tests/bootstrap.php b/tests/TestCase.php
similarity index 88%
rename from tests/bootstrap.php
rename to tests/TestCase.php
index 42244fe..bc36aab 100644
--- a/tests/bootstrap.php
+++ b/tests/TestCase.php
@@ -1,19 +1,17 @@
 <?php
 
+namespace Clue\Tests\React\Block;
+
 use PHPUnit\Framework\TestCase as BaseTestCase;
 use React\Promise\Deferred;
 
-require_once __DIR__ . '/../vendor/autoload.php';
-
-error_reporting(-1);
-
 class TestCase extends BaseTestCase
 {
     protected $loop;
 
     public function setUp()
     {
-        $this->loop = React\EventLoop\Factory::create();
+        $this->loop = \React\EventLoop\Factory::create();
     }
 
     protected function createPromiseResolved($value = null, $delay = 0.01)