diff --git a/tests/Ratchet/Tests/Application/WebSocket/Version/RFC6455Test.php b/tests/Ratchet/Tests/Application/WebSocket/Version/RFC6455Test.php
index d34b6c7..3be4b74 100644
--- a/tests/Ratchet/Tests/Application/WebSocket/Version/RFC6455Test.php
+++ b/tests/Ratchet/Tests/Application/WebSocket/Version/RFC6455Test.php
@@ -119,8 +119,16 @@ class RFC6455Test extends \PHPUnit_Framework_TestCase {
 
     /**
      * @dataProvider headerHandshakeProvider
+     * @todo Can't finish this test until I rewrite headers
      */
     public function testVariousHeadersToCheckHandshakeTolerance($pass, $header) {
-        $this->markTestIncomplete();
+        return $this->markTestIncomplete();
+
+        if ($pass) {
+            $this->assertTrue(is_array($this->_version->handshake($header)));
+        } else {
+            $this->setExpectedException('InvalidArgumentException');
+            $this->_version->handshake($header);
+        }
     }
 }
\ No newline at end of file