diff --git a/codec-socks/src/test/java/io/netty/handler/codec/socksx/v4/Socks4CmdRequestTest.java b/codec-socks/src/test/java/io/netty/handler/codec/socksx/v4/Socks4CmdRequestTest.java
deleted file mode 100755
index 57a60a6f38..0000000000
--- a/codec-socks/src/test/java/io/netty/handler/codec/socksx/v4/Socks4CmdRequestTest.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2012 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.socksx.v4;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class Socks4CmdRequestTest {
-    private static final Logger logger = LoggerFactory.getLogger(Socks4CmdRequestTest.class);
-}
diff --git a/codec-socks/src/test/java/io/netty/handler/codec/socksx/v4/Socks4CmdResponseDecoderTest.java b/codec-socks/src/test/java/io/netty/handler/codec/socksx/v4/Socks4CmdResponseDecoderTest.java
index 819feaad50..84d4b42621 100755
--- a/codec-socks/src/test/java/io/netty/handler/codec/socksx/v4/Socks4CmdResponseDecoderTest.java
+++ b/codec-socks/src/test/java/io/netty/handler/codec/socksx/v4/Socks4CmdResponseDecoderTest.java
@@ -33,7 +33,7 @@ public class Socks4CmdResponseDecoderTest {
         EmbeddedChannel embedder = new EmbeddedChannel(decoder);
         Socks4CommonTestUtils.writeMessageIntoEmbedder(embedder, msg);
 
-        msg = (Socks4Response) embedder.readInbound();
+        msg = embedder.readInbound();
         assertEquals(((Socks4CmdResponse) msg).cmdStatus(), cmdStatus);
         if (host != null) {
             assertEquals(((Socks4CmdResponse) msg).host(), host);
diff --git a/codec-socks/src/test/java/io/netty/handler/codec/socksx/v4/Socks4CmdResponseTest.java b/codec-socks/src/test/java/io/netty/handler/codec/socksx/v4/Socks4CmdResponseTest.java
deleted file mode 100755
index fae7839557..0000000000
--- a/codec-socks/src/test/java/io/netty/handler/codec/socksx/v4/Socks4CmdResponseTest.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2012 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.socksx.v4;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class Socks4CmdResponseTest {
-    private static final Logger logger = LoggerFactory.getLogger(Socks4CmdResponseTest.class);
-}
diff --git a/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/Socks5AuthRequestDecoderTest.java b/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/Socks5AuthRequestDecoderTest.java
index 06f9d8f5c5..ae9235541c 100755
--- a/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/Socks5AuthRequestDecoderTest.java
+++ b/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/Socks5AuthRequestDecoderTest.java
@@ -30,7 +30,7 @@ public class Socks5AuthRequestDecoderTest {
         Socks5AuthRequestDecoder decoder = new Socks5AuthRequestDecoder();
         EmbeddedChannel embedder = new EmbeddedChannel(decoder);
         Socks5CommonTestUtils.writeMessageIntoEmbedder(embedder, msg);
-        msg = (Socks5AuthRequest) embedder.readInbound();
+        msg = embedder.readInbound();
         assertEquals(msg.username(), username);
         assertEquals(msg.username(), password);
         assertNull(embedder.readInbound());
diff --git a/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/Socks5AuthResponseDecoderTest.java b/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/Socks5AuthResponseDecoderTest.java
index acf3d96cd7..4482635fc6 100755
--- a/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/Socks5AuthResponseDecoderTest.java
+++ b/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/Socks5AuthResponseDecoderTest.java
@@ -32,7 +32,7 @@ public class Socks5AuthResponseDecoderTest {
         Socks5AuthResponseDecoder decoder = new Socks5AuthResponseDecoder();
         EmbeddedChannel embedder = new EmbeddedChannel(decoder);
         Socks5CommonTestUtils.writeMessageIntoEmbedder(embedder, msg);
-        msg = (Socks5AuthResponse) embedder.readInbound();
+        msg = embedder.readInbound();
         assertSame(msg.authStatus(), authStatus);
         assertNull(embedder.readInbound());
     }
diff --git a/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/Socks5CmdRequestDecoderTest.java b/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/Socks5CmdRequestDecoderTest.java
index 297380e2fd..0e66a8970a 100755
--- a/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/Socks5CmdRequestDecoderTest.java
+++ b/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/Socks5CmdRequestDecoderTest.java
@@ -39,7 +39,7 @@ public class Socks5CmdRequestDecoderTest {
         if (msg.addressType() == Socks5AddressType.UNKNOWN) {
             assertTrue(embedder.readInbound() instanceof UnknownSocks5Request);
         } else {
-            msg = (Socks5CmdRequest) embedder.readInbound();
+            msg = embedder.readInbound();
             assertSame(msg.cmdType(), cmdType);
             assertSame(msg.addressType(), addressType);
             assertEquals(msg.host(), host);
diff --git a/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/Socks5CmdResponseDecoderTest.java b/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/Socks5CmdResponseDecoderTest.java
index 74c315e5c1..7f449197af 100755
--- a/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/Socks5CmdResponseDecoderTest.java
+++ b/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/Socks5CmdResponseDecoderTest.java
@@ -35,7 +35,7 @@ public class Socks5CmdResponseDecoderTest {
         if (addressType == Socks5AddressType.UNKNOWN) {
             assertTrue(embedder.readInbound() instanceof UnknownSocks5Response);
         } else {
-            msg = (Socks5Response) embedder.readInbound();
+            msg = embedder.readInbound();
             assertEquals(((Socks5CmdResponse) msg).cmdStatus(), cmdStatus);
             if (host != null) {
                 assertEquals(((Socks5CmdResponse) msg).host(), host);