diff --git a/tests/Fetch/Test/AttachmentTest.php b/tests/Fetch/Test/AttachmentTest.php
new file mode 100644
index 0000000..6d13fb2
--- /dev/null
+++ b/tests/Fetch/Test/AttachmentTest.php
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of the Fetch library.
+ *
+ * (c) Robert Hafner <tedivm@tedivm.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Fetch\Test;
+
+
+/**
+ * @package Fetch
+ * @author  Robert Hafner <tedivm@tedivm.com>
+ */
+class AttachmentTest extends \PHPUnit_Framework_TestCase
+{
+
+}
diff --git a/tests/Fetch/Test/MessageTest.php b/tests/Fetch/Test/MessageTest.php
new file mode 100644
index 0000000..5a3536f
--- /dev/null
+++ b/tests/Fetch/Test/MessageTest.php
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of the Fetch library.
+ *
+ * (c) Robert Hafner <tedivm@tedivm.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Fetch\Test;
+
+
+/**
+ * @package Fetch
+ * @author  Robert Hafner <tedivm@tedivm.com>
+ */
+class MessageTest extends \PHPUnit_Framework_TestCase
+{
+
+}
diff --git a/tests/Fetch/Test/ServerTest.php b/tests/Fetch/Test/ServerTest.php
new file mode 100644
index 0000000..24140fe
--- /dev/null
+++ b/tests/Fetch/Test/ServerTest.php
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of the Fetch library.
+ *
+ * (c) Robert Hafner <tedivm@tedivm.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Fetch\Test;
+
+
+/**
+ * @package Fetch
+ * @author  Robert Hafner <tedivm@tedivm.com>
+ */
+class ServerTest extends \PHPUnit_Framework_TestCase
+{
+
+}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
new file mode 100644
index 0000000..856bbfd
--- /dev/null
+++ b/tests/bootstrap.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of the Stash package.
+ *
+ * (c) Robert Hafner <tedivm@tedivm.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+define('TESTING', true);
+
+error_reporting(-1);
+
+spl_autoload_register(function($class) {
+    if (0 === strpos($class, 'Fetch\\Test\\')) {
+        $file = __DIR__ . '/../tests/' . str_replace('\\', '/', $class) . '.php';
+        if (file_exists($file)) {
+            require_once $file;
+            return true;
+        }
+    } elseif (0 === strpos($class, 'Fetch\\')) {
+        $file = __DIR__ . '/../src/' . str_replace('\\', '/', $class) . '.php';
+        if (file_exists($file)) {
+            require_once $file;
+            return true;
+        }
+    }
+});