diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index 48d4265113..d2ef759f08 100644
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -56,10 +56,49 @@
       <optional>true</optional>
     </dependency>
 
+    <!-- Required for generating a compressed heap dump file -->
     <dependency>
       <groupId>org.tukaani</groupId>
       <artifactId>xz</artifactId>
     </dependency>
+
+    <!-- Testing frameworks and related dependencies -->
+    <!-- NOTE: Keep these dependencies in sync with the parent POM's common test dependencies. -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-library</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easymock</groupId>
+      <artifactId>easymock</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easymock</groupId>
+      <artifactId>easymockclassextension</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jmock</groupId>
+      <artifactId>jmock-junit4</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 
   <properties>
@@ -83,15 +122,11 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>test-jar</goal>
-            </goals>
-          </execution>
-        </executions>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <testSourceDirectory>${project.build.sourceDirectory}</testSourceDirectory>
+          <testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>me.normanmaurer.maven.autobahntestsuite</groupId>
@@ -117,6 +152,5 @@
       </plugin>
     </plugins>
   </build>
-
 </project>
 
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/AbstractComboTestsuiteTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/AbstractComboTestsuiteTest.java
similarity index 100%
rename from testsuite/src/test/java/io/netty/testsuite/transport/AbstractComboTestsuiteTest.java
rename to testsuite/src/main/java/io/netty/testsuite/transport/AbstractComboTestsuiteTest.java
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/AbstractTestsuiteTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/AbstractTestsuiteTest.java
similarity index 100%
rename from testsuite/src/test/java/io/netty/testsuite/transport/AbstractTestsuiteTest.java
rename to testsuite/src/main/java/io/netty/testsuite/transport/AbstractTestsuiteTest.java
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/TestsuitePermutation.java b/testsuite/src/main/java/io/netty/testsuite/transport/TestsuitePermutation.java
similarity index 100%
rename from testsuite/src/test/java/io/netty/testsuite/transport/TestsuitePermutation.java
rename to testsuite/src/main/java/io/netty/testsuite/transport/TestsuitePermutation.java
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/package-info.java b/testsuite/src/main/java/io/netty/testsuite/transport/package-info.java
new file mode 100644
index 0000000000..188b1164dd
--- /dev/null
+++ b/testsuite/src/main/java/io/netty/testsuite/transport/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+
+/**
+ * Common test suite classes.
+ */
+package io.netty.testsuite.transport;
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/sctp/AbstractSctpTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/sctp/AbstractSctpTest.java
similarity index 100%
rename from testsuite/src/test/java/io/netty/testsuite/transport/sctp/AbstractSctpTest.java
rename to testsuite/src/main/java/io/netty/testsuite/transport/sctp/AbstractSctpTest.java
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/sctp/SctpEchoTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/sctp/SctpEchoTest.java
similarity index 100%
rename from testsuite/src/test/java/io/netty/testsuite/transport/sctp/SctpEchoTest.java
rename to testsuite/src/main/java/io/netty/testsuite/transport/sctp/SctpEchoTest.java
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/sctp/SctpTestPermutation.java b/testsuite/src/main/java/io/netty/testsuite/transport/sctp/SctpTestPermutation.java
similarity index 100%
rename from testsuite/src/test/java/io/netty/testsuite/transport/sctp/SctpTestPermutation.java
rename to testsuite/src/main/java/io/netty/testsuite/transport/sctp/SctpTestPermutation.java
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/sctp/package-info.java b/testsuite/src/main/java/io/netty/testsuite/transport/sctp/package-info.java
similarity index 100%
rename from testsuite/src/test/java/io/netty/testsuite/transport/sctp/package-info.java
rename to testsuite/src/main/java/io/netty/testsuite/transport/sctp/package-info.java
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractClientSocketTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/AbstractClientSocketTest.java
similarity index 100%
rename from testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractClientSocketTest.java
rename to testsuite/src/main/java/io/netty/testsuite/transport/socket/AbstractClientSocketTest.java
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractDatagramTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/AbstractDatagramTest.java
similarity index 100%
rename from testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractDatagramTest.java
rename to testsuite/src/main/java/io/netty/testsuite/transport/socket/AbstractDatagramTest.java
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractServerSocketTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/AbstractServerSocketTest.java
similarity index 100%
rename from testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractServerSocketTest.java
rename to testsuite/src/main/java/io/netty/testsuite/transport/socket/AbstractServerSocketTest.java
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/AbstractSocketTest.java
similarity index 100%
rename from testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketTest.java
rename to testsuite/src/main/java/io/netty/testsuite/transport/socket/AbstractSocketTest.java
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/DatagramMulticastTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/DatagramMulticastTest.java
similarity index 100%
rename from testsuite/src/test/java/io/netty/testsuite/transport/socket/DatagramMulticastTest.java
rename to testsuite/src/main/java/io/netty/testsuite/transport/socket/DatagramMulticastTest.java
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/DatagramUnicastTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/DatagramUnicastTest.java
similarity index 100%
rename from testsuite/src/test/java/io/netty/testsuite/transport/socket/DatagramUnicastTest.java
rename to testsuite/src/main/java/io/netty/testsuite/transport/socket/DatagramUnicastTest.java
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/ServerSocketSuspendTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/ServerSocketSuspendTest.java
similarity index 100%
rename from testsuite/src/test/java/io/netty/testsuite/transport/socket/ServerSocketSuspendTest.java
rename to testsuite/src/main/java/io/netty/testsuite/transport/socket/ServerSocketSuspendTest.java
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketAutoReadTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketAutoReadTest.java
similarity index 100%
rename from testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketAutoReadTest.java
rename to testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketAutoReadTest.java
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketBufReleaseTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketBufReleaseTest.java
similarity index 100%
rename from testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketBufReleaseTest.java
rename to testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketBufReleaseTest.java
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketCancelWriteTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketCancelWriteTest.java
similarity index 100%
rename from testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketCancelWriteTest.java
rename to testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketCancelWriteTest.java
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketConnectionAttemptTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketConnectionAttemptTest.java
similarity index 100%
rename from testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketConnectionAttemptTest.java
rename to testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketConnectionAttemptTest.java
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketEchoTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketEchoTest.java
similarity index 100%
rename from testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketEchoTest.java
rename to testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketEchoTest.java
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketFileRegionTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketFileRegionTest.java
similarity index 100%
rename from testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketFileRegionTest.java
rename to testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketFileRegionTest.java
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketFixedLengthEchoTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketFixedLengthEchoTest.java
similarity index 100%
rename from testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketFixedLengthEchoTest.java
rename to testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketFixedLengthEchoTest.java
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketGatheringWriteTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketGatheringWriteTest.java
similarity index 100%
rename from testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketGatheringWriteTest.java
rename to testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketGatheringWriteTest.java
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketObjectEchoTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketObjectEchoTest.java
similarity index 100%
rename from testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketObjectEchoTest.java
rename to testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketObjectEchoTest.java
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketShutdownOutputByPeerTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketShutdownOutputByPeerTest.java
similarity index 100%
rename from testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketShutdownOutputByPeerTest.java
rename to testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketShutdownOutputByPeerTest.java
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketShutdownOutputBySelfTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketShutdownOutputBySelfTest.java
similarity index 100%
rename from testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketShutdownOutputBySelfTest.java
rename to testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketShutdownOutputBySelfTest.java
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketSpdyEchoTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSpdyEchoTest.java
similarity index 100%
rename from testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketSpdyEchoTest.java
rename to testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSpdyEchoTest.java
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketSslEchoTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSslEchoTest.java
similarity index 100%
rename from testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketSslEchoTest.java
rename to testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSslEchoTest.java
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketSslGreetingTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSslGreetingTest.java
similarity index 100%
rename from testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketSslGreetingTest.java
rename to testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSslGreetingTest.java
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketStartTlsTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketStartTlsTest.java
similarity index 100%
rename from testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketStartTlsTest.java
rename to testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketStartTlsTest.java
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketStringEchoTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketStringEchoTest.java
similarity index 100%
rename from testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketStringEchoTest.java
rename to testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketStringEchoTest.java
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketTestPermutation.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketTestPermutation.java
similarity index 100%
rename from testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketTestPermutation.java
rename to testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketTestPermutation.java
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/TrafficShapingHandlerTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/TrafficShapingHandlerTest.java
similarity index 100%
rename from testsuite/src/test/java/io/netty/testsuite/transport/socket/TrafficShapingHandlerTest.java
rename to testsuite/src/main/java/io/netty/testsuite/transport/socket/TrafficShapingHandlerTest.java
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/WriteBeforeRegisteredTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/WriteBeforeRegisteredTest.java
similarity index 100%
rename from testsuite/src/test/java/io/netty/testsuite/transport/socket/WriteBeforeRegisteredTest.java
rename to testsuite/src/main/java/io/netty/testsuite/transport/socket/WriteBeforeRegisteredTest.java
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/package-info.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/package-info.java
similarity index 100%
rename from testsuite/src/test/java/io/netty/testsuite/transport/socket/package-info.java
rename to testsuite/src/main/java/io/netty/testsuite/transport/socket/package-info.java
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/udt/UDTClientServerConnectionTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/udt/UDTClientServerConnectionTest.java
similarity index 100%
rename from testsuite/src/test/java/io/netty/testsuite/transport/udt/UDTClientServerConnectionTest.java
rename to testsuite/src/main/java/io/netty/testsuite/transport/udt/UDTClientServerConnectionTest.java
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/udt/package-info.java b/testsuite/src/main/java/io/netty/testsuite/transport/udt/package-info.java
similarity index 100%
rename from testsuite/src/test/java/io/netty/testsuite/transport/udt/package-info.java
rename to testsuite/src/main/java/io/netty/testsuite/transport/udt/package-info.java
diff --git a/testsuite/src/test/java/io/netty/testsuite/util/TestUtils.java b/testsuite/src/main/java/io/netty/testsuite/util/TestUtils.java
similarity index 100%
rename from testsuite/src/test/java/io/netty/testsuite/util/TestUtils.java
rename to testsuite/src/main/java/io/netty/testsuite/util/TestUtils.java
diff --git a/testsuite/src/test/java/io/netty/testsuite/util/package-info.java b/testsuite/src/main/java/io/netty/testsuite/util/package-info.java
similarity index 100%
rename from testsuite/src/test/java/io/netty/testsuite/util/package-info.java
rename to testsuite/src/main/java/io/netty/testsuite/util/package-info.java
diff --git a/testsuite/src/test/java/io/netty/testsuite/websockets/autobahn/AutobahnServer.java b/testsuite/src/main/java/io/netty/testsuite/websockets/autobahn/AutobahnServer.java
similarity index 100%
rename from testsuite/src/test/java/io/netty/testsuite/websockets/autobahn/AutobahnServer.java
rename to testsuite/src/main/java/io/netty/testsuite/websockets/autobahn/AutobahnServer.java
diff --git a/testsuite/src/test/java/io/netty/testsuite/websockets/autobahn/AutobahnServerHandler.java b/testsuite/src/main/java/io/netty/testsuite/websockets/autobahn/AutobahnServerHandler.java
similarity index 100%
rename from testsuite/src/test/java/io/netty/testsuite/websockets/autobahn/AutobahnServerHandler.java
rename to testsuite/src/main/java/io/netty/testsuite/websockets/autobahn/AutobahnServerHandler.java
diff --git a/testsuite/src/test/java/io/netty/testsuite/websockets/autobahn/AutobahnServerInitializer.java b/testsuite/src/main/java/io/netty/testsuite/websockets/autobahn/AutobahnServerInitializer.java
similarity index 100%
rename from testsuite/src/test/java/io/netty/testsuite/websockets/autobahn/AutobahnServerInitializer.java
rename to testsuite/src/main/java/io/netty/testsuite/websockets/autobahn/AutobahnServerInitializer.java
diff --git a/testsuite/src/test/java/io/netty/testsuite/websockets/autobahn/package-info.java b/testsuite/src/main/java/io/netty/testsuite/websockets/autobahn/package-info.java
similarity index 100%
rename from testsuite/src/test/java/io/netty/testsuite/websockets/autobahn/package-info.java
rename to testsuite/src/main/java/io/netty/testsuite/websockets/autobahn/package-info.java
diff --git a/transport-native-epoll/pom.xml b/transport-native-epoll/pom.xml
index bf77b81b43..84c3c4fdab 100644
--- a/transport-native-epoll/pom.xml
+++ b/transport-native-epoll/pom.xml
@@ -46,7 +46,6 @@
       <groupId>io.netty</groupId>
       <artifactId>netty-testsuite</artifactId>
       <version>${project.version}</version>
-      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>