diff --git a/tests/Ratchet/Tests/ServerTest.php b/tests/Ratchet/Tests/Application/Server/AppTest.php
similarity index 92%
rename from tests/Ratchet/Tests/ServerTest.php
rename to tests/Ratchet/Tests/Application/Server/AppTest.php
index 026d530..d8120d5 100644
--- a/tests/Ratchet/Tests/ServerTest.php
+++ b/tests/Ratchet/Tests/Application/Server/AppTest.php
@@ -5,9 +5,9 @@ use Ratchet\Tests\Mock\FakeSocket as Socket;
 use Ratchet\Tests\Mock\Application as TestApp;
 
 /**
- * @covers Ratchet\Server
+ * @covers Ratchet\Server\App
  */
-class ServerTest extends \PHPUnit_Framework_TestCase {
+class AppTest extends \PHPUnit_Framework_TestCase {
     protected $_catalyst;
     protected $_server;
     protected $_app;
diff --git a/tests/Ratchet/Tests/Protocol/WebSocketTest.php b/tests/Ratchet/Tests/Application/WebSocket/AppTest.php
similarity index 52%
rename from tests/Ratchet/Tests/Protocol/WebSocketTest.php
rename to tests/Ratchet/Tests/Application/WebSocket/AppTest.php
index 264e820..126647a 100644
--- a/tests/Ratchet/Tests/Protocol/WebSocketTest.php
+++ b/tests/Ratchet/Tests/Application/WebSocket/AppTest.php
@@ -1,17 +1,17 @@
 <?php
-namespace Ratchet\Tests\Protocol;
-use Ratchet\Application\WebSocket\App as WebSocket;
+namespace Ratchet\Tests\Application\WebSocket;
+use Ratchet\Application\WebSocket\App as RealApp;
 use Ratchet\Tests\Mock\Socket;
 use Ratchet\Tests\Mock\Application;
 
 /**
- * @covers Ratchet\Application\WebSocket
+ * @covers Ratchet\Application\WebSocket\App
  */
-class WebSocketTest extends \PHPUnit_Framework_TestCase {
+class AppTest extends \PHPUnit_Framework_TestCase {
     protected $_ws;
 
     public function setUp() {
-        $this->_ws = new WebSocket(new Application);
+        $this->_ws = new RealApp(new Application);
     }
 
     public function testGetConfigReturnsArray() {
diff --git a/tests/Ratchet/Tests/Protocol/WebSocket/Version/Hixie76Test.php b/tests/Ratchet/Tests/Application/WebSocket/Version/Hixie76Test.php
similarity index 93%
rename from tests/Ratchet/Tests/Protocol/WebSocket/Version/Hixie76Test.php
rename to tests/Ratchet/Tests/Application/WebSocket/Version/Hixie76Test.php
index f01da26..58a6245 100644
--- a/tests/Ratchet/Tests/Protocol/WebSocket/Version/Hixie76Test.php
+++ b/tests/Ratchet/Tests/Application/WebSocket/Version/Hixie76Test.php
@@ -1,5 +1,5 @@
 <?php
-namespace Ratchet\Tests\Protocol\WebSocket\Version;
+namespace Ratchet\Tests\Application\WebSocket\Version;
 use Ratchet\Application\WebSocket\Version\Hixie76;
 
 /**
diff --git a/tests/Ratchet/Tests/Protocol/WebSocket/Version/HyBi10Test.php b/tests/Ratchet/Tests/Application/WebSocket/Version/HyBi10Test.php
similarity index 97%
rename from tests/Ratchet/Tests/Protocol/WebSocket/Version/HyBi10Test.php
rename to tests/Ratchet/Tests/Application/WebSocket/Version/HyBi10Test.php
index fe6bff8..a78dc26 100644
--- a/tests/Ratchet/Tests/Protocol/WebSocket/Version/HyBi10Test.php
+++ b/tests/Ratchet/Tests/Application/WebSocket/Version/HyBi10Test.php
@@ -1,5 +1,5 @@
 <?php
-namespace Ratchet\Tests\Protocol\WebSocket\Version;
+namespace Ratchet\Tests\Application\WebSocket\Version;
 use Ratchet\Application\WebSocket\Version\HyBi10;
 
 /**