diff --git a/test/src/MiddlewareMock.php b/test/src/Doubles/MiddlewareMock.php
similarity index 95%
rename from test/src/MiddlewareMock.php
rename to test/src/Doubles/MiddlewareMock.php
index 628ceee..280e950 100644
--- a/test/src/MiddlewareMock.php
+++ b/test/src/Doubles/MiddlewareMock.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace WellRESTed\Test;
+namespace WellRESTed\Test\Doubles;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
diff --git a/test/src/NextMock.php b/test/src/Doubles/NextMock.php
similarity index 92%
rename from test/src/NextMock.php
rename to test/src/Doubles/NextMock.php
index 93e1d8a..02015ff 100644
--- a/test/src/NextMock.php
+++ b/test/src/Doubles/NextMock.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace WellRESTed\Test;
+namespace WellRESTed\Test\Doubles;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
diff --git a/test/tests/unit/Dispatching/DispatchStackTest.php b/test/tests/unit/Dispatching/DispatchStackTest.php
index 37542da..c4451f8 100644
--- a/test/tests/unit/Dispatching/DispatchStackTest.php
+++ b/test/tests/unit/Dispatching/DispatchStackTest.php
@@ -6,7 +6,7 @@ use WellRESTed\Dispatching\Dispatcher;
 use WellRESTed\Dispatching\DispatchStack;
 use WellRESTed\Message\Response;
 use WellRESTed\Message\ServerRequest;
-use WellRESTed\Test\NextMock;
+use WellRESTed\Test\Doubles\NextMock;
 
 /**
  * @covers WellRESTed\Dispatching\DispatchStack
diff --git a/test/tests/unit/Dispatching/DispatcherTest.php b/test/tests/unit/Dispatching/DispatcherTest.php
index e386de1..625cc3b 100644
--- a/test/tests/unit/Dispatching/DispatcherTest.php
+++ b/test/tests/unit/Dispatching/DispatcherTest.php
@@ -9,7 +9,7 @@ use WellRESTed\Dispatching\Dispatcher;
 use WellRESTed\Message\Response;
 use WellRESTed\Message\ServerRequest;
 use WellRESTed\MiddlewareInterface;
-use WellRESTed\Test\NextMock;
+use WellRESTed\Test\Doubles\NextMock;
 
 /**
  * @covers WellRESTed\Dispatching\Dispatcher
diff --git a/test/tests/unit/Routing/MethodMapTest.php b/test/tests/unit/Routing/MethodMapTest.php
index 29f46d9..0294a6d 100644
--- a/test/tests/unit/Routing/MethodMapTest.php
+++ b/test/tests/unit/Routing/MethodMapTest.php
@@ -7,8 +7,8 @@ use WellRESTed\Dispatching\Dispatcher;
 use WellRESTed\Message\Response;
 use WellRESTed\Message\ServerRequest;
 use WellRESTed\Routing\MethodMap;
-use WellRESTed\Test\MiddlewareMock;
-use WellRESTed\Test\NextMock;
+use WellRESTed\Test\Doubles\MiddlewareMock;
+use WellRESTed\Test\Doubles\NextMock;
 
 /**
  * @covers WellRESTed\Routing\MethodMap
diff --git a/test/tests/unit/Routing/RouterTest.php b/test/tests/unit/Routing/RouterTest.php
index b8a48f7..6aaa367 100644
--- a/test/tests/unit/Routing/RouterTest.php
+++ b/test/tests/unit/Routing/RouterTest.php
@@ -8,7 +8,7 @@ use WellRESTed\Message\Response;
 use WellRESTed\Message\ServerRequest;
 use WellRESTed\Routing\Route\RouteInterface;
 use WellRESTed\Routing\Router;
-use WellRESTed\Test\NextMock;
+use WellRESTed\Test\Doubles\NextMock;
 
 /**
  * @covers WellRESTed\Routing\Router
diff --git a/test/tests/unit/ServerTest.php b/test/tests/unit/ServerTest.php
index 5e6fd57..e4cb766 100644
--- a/test/tests/unit/ServerTest.php
+++ b/test/tests/unit/ServerTest.php
@@ -6,7 +6,7 @@ use Prophecy\Argument;
 use WellRESTed\Message\Response;
 use WellRESTed\Message\ServerRequest;
 use WellRESTed\Server;
-use WellRESTed\Test\NextMock;
+use WellRESTed\Test\Doubles\NextMock;
 
 /** @covers WellRESTed\Server */
 class ServerTest extends \PHPUnit_Framework_TestCase