diff --git a/src/test/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker17Test.java b/src/test/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker17Test.java
new file mode 100644
index 0000000000..a2186d241e
--- /dev/null
+++ b/src/test/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker17Test.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2011 The Netty Project
+ *
+ * The Netty Project licenses this file to you under the Apache License,
+ * version 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package io.netty.handler.codec.http.websocketx;
+
+import static io.netty.handler.codec.http.HttpHeaders.Values.WEBSOCKET;
+import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
+import static org.easymock.EasyMock.capture;
+import static org.easymock.EasyMock.replay;
+import io.netty.channel.Channel;
+import io.netty.channel.DefaultChannelFuture;
+import io.netty.channel.DefaultChannelPipeline;
+import io.netty.handler.codec.http.DefaultHttpRequest;
+import io.netty.handler.codec.http.HttpChunkAggregator;
+import io.netty.handler.codec.http.HttpHeaders.Names;
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpRequestDecoder;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.HttpResponseEncoder;
+
+import org.easymock.Capture;
+import org.easymock.EasyMock;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class WebSocketServerHandshaker17Test {
+    
+    private DefaultChannelPipeline createPipeline() {
+        DefaultChannelPipeline pipeline = new DefaultChannelPipeline();
+        pipeline.addLast("chunkAggregator", new HttpChunkAggregator(42));
+        pipeline.addLast("requestDecoder", new HttpRequestDecoder());
+        pipeline.addLast("responseEncoder", new HttpResponseEncoder());
+        return pipeline;
+    }
+    
+    @Test
+    public void testPerformOpeningHandshake() {
+        Channel channelMock = EasyMock.createMock(Channel.class);
+        
+        DefaultChannelPipeline pipeline = createPipeline();
+        EasyMock.expect(channelMock.getPipeline()).andReturn(pipeline);
+        
+        // capture the http response in order to verify the headers
+        Capture<HttpResponse> res = new Capture<HttpResponse>();
+        EasyMock.expect(channelMock.write(capture(res))).andReturn(new DefaultChannelFuture(channelMock, true));
+        
+        replay(channelMock);
+        
+        HttpRequest req = new DefaultHttpRequest(HTTP_1_1, HttpMethod.GET, "/chat");
+        req.setHeader(Names.HOST, "server.example.com");
+        req.setHeader(Names.UPGRADE, WEBSOCKET.toLowerCase());
+        req.setHeader(Names.CONNECTION, "Upgrade");
+        req.setHeader(Names.SEC_WEBSOCKET_KEY, "dGhlIHNhbXBsZSBub25jZQ==");
+        req.setHeader(Names.SEC_WEBSOCKET_ORIGIN, "http://example.com");
+        req.setHeader(Names.SEC_WEBSOCKET_PROTOCOL, "chat, superchat");
+        req.setHeader(Names.SEC_WEBSOCKET_VERSION, "13");
+        
+        WebSocketServerHandshaker17 handsaker17 = new WebSocketServerHandshaker17("ws://example.com/chat", "chat", false);
+        handsaker17.performOpeningHandshake(channelMock, req);
+        
+        Assert.assertEquals("s3pPLMBiTxaQ9kYGzzhZRbK+xOo=", res.getValue().getHeader(Names.SEC_WEBSOCKET_ACCEPT));
+        Assert.assertEquals("chat", res.getValue().getHeader(Names.SEC_WEBSOCKET_PROTOCOL));
+    }
+}