diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..eefacf1
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+phpunit.xml
+coverage
\ No newline at end of file
diff --git a/lib/Ratchet/Protocol/ProtocolInterface.php b/lib/Ratchet/Protocol/ProtocolInterface.php
index 35f0048..145530d 100644
--- a/lib/Ratchet/Protocol/ProtocolInterface.php
+++ b/lib/Ratchet/Protocol/ProtocolInterface.php
@@ -1,7 +1,6 @@
 <?php
 namespace Ratchet\Protocol;
-use Ratchet\Server;
+use Ratchet\ServerInterface;
 
-interface ProtocolInterface {
-    function __construct(Server $server);
+interface ProtocolInterface extends ServerInterface {
 }
\ No newline at end of file
diff --git a/lib/Ratchet/Protocol/WebSocket/Server.php b/lib/Ratchet/Protocol/WebSocket/Server.php
index e7f3795..69af4a6 100644
--- a/lib/Ratchet/Protocol/WebSocket/Server.php
+++ b/lib/Ratchet/Protocol/WebSocket/Server.php
@@ -3,10 +3,13 @@ namespace Ratchet\Protocol\WebSocket;
 use Ratchet\ServerInterface;
 use Ratchet\Protocol\ProtocolInterface;
 
-class Server implements ServerInterface, ProtocolInterface {
+class Server implements ProtocolInterface {
     protected $_server = null;
 
     public function __construct(ServerInterface $server) {
         $this->_server = $server;
     }
+
+    public function run() {
+    }
 }
\ No newline at end of file
diff --git a/tests/Ratchet/Tests/Protocol/WebSocket/ServerTest.php b/tests/Ratchet/Tests/Protocol/WebSocket/ServerTest.php
new file mode 100644
index 0000000..08cbf2f
--- /dev/null
+++ b/tests/Ratchet/Tests/Protocol/WebSocket/ServerTest.php
@@ -0,0 +1,26 @@
+<?php
+namespace Ratchet\Tests\Protocol\WebSocket;
+use Ratchet\Server;
+use Ratchet\Protocol\WebSocket\Server as WebServer;
+use Ratchet\Tests\Mock\Socket;
+
+/**
+ * @covers Ratchet\Protocol\WebSocket\Server
+ */
+class ServerTest extends \PHPUnit_Framework_TestCase {
+    protected $_server;
+
+    public function setUp() {
+        $this->_server = new WebServer(new Server(new Socket()));
+    }
+
+    public function testServerImplementsServerInterface() {
+        $constraint = $this->isInstanceOf('\\Ratchet\\ServerInterface');
+        $this->assertThat($this->_server, $constraint);
+    }
+
+    public function testServerImplementsProtocolInterface() {
+        $constraint = $this->isInstanceOf('\\Ratchet\\Protocol\ProtocolInterface');
+        $this->assertThat($this->_server, $constraint);
+    }
+}
\ No newline at end of file